Upstream merge

2015-03-16 19:47:37 +00:00
parent 3c15908aac
commit dbbf5810b9
2 changed files with 9 additions and 9 deletions
--- a/CraftBukkit-Patches/0012-Spigot-Timings.patch
+++ b/CraftBukkit-Patches/0012-Spigot-Timings.patch
@@ -70,8 +70,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
             Chunk chunk = (Chunk) data[0];
             NBTTagCompound nbttagcompound = (NBTTagCompound) data[1];
@@ -0,0 +0,0 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
- 
-     public void loadEntities(Chunk chunk, NBTTagCompound nbttagcompound, World world) {
+             chunk.entitySlices[k] = new EntitySlice(Entity.class);
+         }
         // CraftBukkit end
 -
 +        world.timings.syncChunkLoadEntitiesTimer.startTiming(); // Spigot