Update to Minecraft 1.8.8 (Pre-)Release.

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2015-07-27 22:19:19 +10:00
parent c0e326b62a
commit 332e77d249
7 changed files with 22 additions and 29 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/ChunkRegionLoader.java
+++ b/net/minecraft/server/ChunkRegionLoader.java
@@ -25,7 +25,35 @@
@@ -26,7 +26,35 @@
this.d = file;
}
@@ -36,7 +36,7 @@
ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
NBTTagCompound nbttagcompound = (NBTTagCompound) this.b.get(chunkcoordintpair);
@@ -42,7 +70,7 @@
@@ -43,7 +71,7 @@
return this.a(world, i, j, nbttagcompound);
}
@@ -45,7 +45,7 @@
if (!nbttagcompound.hasKeyOfType("Level", 10)) {
ChunkRegionLoader.a.error("Chunk file at " + i + "," + j + " is missing level data, skipping");
return null;
@@ -59,10 +87,28 @@
@@ -60,10 +88,28 @@
ChunkRegionLoader.a.error("Chunk file at " + i + "," + j + " is in the wrong location; relocating. (Expected " + i + ", " + j + ", got " + chunk.locX + ", " + chunk.locZ + ")");
nbttagcompound1.setInt("xPos", i);
nbttagcompound1.setInt("zPos", j);
@@ -75,7 +75,7 @@
}
}
}
@@ -290,7 +336,26 @@
@@ -303,7 +349,26 @@
int k1 = l >> 4 & 15;
int l1 = nibblearray1 != null ? nibblearray1.a(i1, j1, k1) : 0;
@@ -103,7 +103,7 @@
}
chunksection.a(achar);
@@ -308,6 +373,13 @@
@@ -321,6 +386,13 @@
chunk.a(nbttagcompound.getByteArray("Biomes"));
}
@@ -117,7 +117,7 @@
NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10);
if (nbttaglist1 != null) {
@@ -366,6 +438,6 @@
@@ -379,6 +451,6 @@
}
}