From 30d751b3626704d01cced352c728830136d77a54 Mon Sep 17 00:00:00 2001 From: Thinkofdeath <thinkofdeath@spigotmc.org> Date: Mon, 16 Mar 2015 19:44:51 +0000 Subject: [PATCH] Move the entity slice loading --- nms-patches/ChunkRegionLoader.patch | 12 ++++++++---- .../bukkit/craftbukkit/chunkio/ChunkIOProvider.java | 4 ---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/nms-patches/ChunkRegionLoader.patch b/nms-patches/ChunkRegionLoader.patch index d97767539c..d20b674453 100644 --- a/nms-patches/ChunkRegionLoader.patch +++ b/nms-patches/ChunkRegionLoader.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/ChunkRegionLoader.java 2015-02-26 22:40:22.327608142 +0000 -+++ src/main/java/net/minecraft/server/ChunkRegionLoader.java 2015-02-26 22:40:22.331608142 +0000 +--- /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 @@ -25,7 +25,39 @@ this.e = file; } @@ -107,7 +107,7 @@ } chunksection.a(achar); -@@ -326,6 +395,13 @@ +@@ -326,6 +395,17 @@ chunk.a(nbttagcompound.getByteArray("Biomes")); } @@ -116,12 +116,16 @@ + } + + 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 +460,7 @@ +@@ -384,7 +464,7 @@ } } diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java index 0f445dfc79..c31f17f71e 100644 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOProvider.java @@ -42,10 +42,6 @@ class ChunkIOProvider implements AsynchronousExecutor.CallBackProvider<QueuedChu queuedChunk.provider.originalGetChunkAt(queuedChunk.x, queuedChunk.z); return; } - // moved from Chunk.<init> - for (int k = 0; k < chunk.entitySlices.length; ++k) { - chunk.entitySlices[k] = new EntitySlice(Entity.class); - } queuedChunk.loader.loadEntities(chunk, queuedChunk.compound.getCompound("Level"), queuedChunk.world); chunk.setLastSaved(queuedChunk.provider.world.getTime());