diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-22 19:01:30 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-03-22 19:01:30 +0000 |
| commit | 3fce0ec0f5462b0478c6b85ae5c8026f69a2911b (patch) | |
| tree | 294dcc1b78421e3b20239ddf8d826e5246d293d6 /nms-patches/ChunkRegionLoader.patch | |
| parent | 0af2738ae2889e08268a4315a4f63486cfc65e28 (diff) | |
| download | craftbukkit-3fce0ec0f5462b0478c6b85ae5c8026f69a2911b.tar craftbukkit-3fce0ec0f5462b0478c6b85ae5c8026f69a2911b.tar.gz craftbukkit-3fce0ec0f5462b0478c6b85ae5c8026f69a2911b.tar.lz craftbukkit-3fce0ec0f5462b0478c6b85ae5c8026f69a2911b.tar.xz craftbukkit-3fce0ec0f5462b0478c6b85ae5c8026f69a2911b.zip | |
SPIGOT-729: Revert the entity slice move
Diffstat (limited to 'nms-patches/ChunkRegionLoader.patch')
| -rw-r--r-- | nms-patches/ChunkRegionLoader.patch | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/nms-patches/ChunkRegionLoader.patch b/nms-patches/ChunkRegionLoader.patch index d20b6744..a829e2df 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-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 @@ } } |