SPIGOT-729: Revert the entity slice move

By: Thinkofdeath <thinkofdeath@spigotmc.org>
This commit is contained in:
CraftBukkit/Spigot
2015-03-22 19:01:30 +00:00
parent e1387f5ef4
commit c52ea50ad9
4 changed files with 24 additions and 45 deletions

View File

@@ -1,5 +1,5 @@
--- /home/matt/mc-dev-private//net/minecraft/server/ChunkRegionLoader.java 2015-03-16 19:44:31.166833062 +0000
+++ src/main/java/net/minecraft/server/ChunkRegionLoader.java 2015-03-16 19:44:31.166833062 +0000
--- /home/matt/mc-dev-private//net/minecraft/server/ChunkRegionLoader.java 2015-03-22 19:01:20.065879491 +0000
+++ src/main/java/net/minecraft/server/ChunkRegionLoader.java 2015-03-22 19:01:20.065879491 +0000
@@ -25,7 +25,39 @@
this.e = file;
}
@@ -107,7 +107,7 @@
}
chunksection.a(achar);
@@ -326,6 +395,17 @@
@@ -326,6 +395,13 @@
chunk.a(nbttagcompound.getByteArray("Biomes"));
}
@@ -116,16 +116,12 @@
+ }
+
+ public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) {
+ // moved from Chunk.<init>
+ for (int k = 0; k < chunk.entitySlices.length; ++k) {
+ chunk.entitySlices[k] = new EntitySlice(Entity.class);
+ }
+ // CraftBukkit end
+
NBTTagList nbttaglist1 = nbttagcompound.getList("Entities", 10);
if (nbttaglist1 != null) {
@@ -384,7 +464,7 @@
@@ -384,7 +460,7 @@
}
}