Upstream merge

This commit is contained in:
Thinkofdeath
2015-04-16 22:34:44 +01:00
parent 093677dbdd
commit 911a5d776b
2 changed files with 0 additions and 219 deletions

View File

@@ -21,18 +21,6 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
NBTBase nbtbase = a(datainput, 0, nbtreadlimiter);
if (nbtbase instanceof NBTTagCompound) {
diff --git a/src/main/java/net/minecraft/server/NBTTagList.java b/src/main/java/net/minecraft/server/NBTTagList.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/net/minecraft/server/NBTTagList.java
+++ b/src/main/java/net/minecraft/server/NBTTagList.java
@@ -0,0 +0,0 @@ public class NBTTagList extends NBTBase {
for (int k = 0; k < j; ++k) {
NBTBase nbtbase = NBTBase.createTag(this.type);
+ nbtreadlimiter.a(8); // Spigot
nbtbase.load(datainput, i + 1, nbtreadlimiter);
this.list.add(nbtbase);
diff --git a/src/main/java/org/spigotmc/LimitStream.java b/src/main/java/org/spigotmc/LimitStream.java
new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000