diff options
Diffstat (limited to 'nms-patches/ChunkProviderServer.patch')
| -rw-r--r-- | nms-patches/ChunkProviderServer.patch | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/nms-patches/ChunkProviderServer.patch b/nms-patches/ChunkProviderServer.patch index c7d01ea3..7f933142 100644 --- a/nms-patches/ChunkProviderServer.patch +++ b/nms-patches/ChunkProviderServer.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/ChunkProviderServer.java 2015-03-15 21:37:46.552362734 +0000 -+++ src/main/java/net/minecraft/server/ChunkProviderServer.java 2015-03-15 21:37:46.552362734 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/ChunkProviderServer.java 2015-03-22 19:01:20.021879491 +0000 ++++ src/main/java/net/minecraft/server/ChunkProviderServer.java 2015-03-22 19:01:20.021879491 +0000 @@ -11,17 +11,28 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -138,7 +138,7 @@ if (chunk == null) { chunk = this.loadChunk(i, j); -@@ -79,16 +144,49 @@ +@@ -79,16 +144,44 @@ CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Chunk to be generated"); crashreportsystemdetails.a("Location", (Object) String.format("%d,%d", new Object[] { Integer.valueOf(i), Integer.valueOf(j)})); @@ -155,11 +155,6 @@ - this.chunkList.add(chunk); + this.chunks.put(LongHash.toLong(i, j), chunk); + -+ // CraftBukkit start - moved from Chunk.<init> -+ for (int k = 0; k < chunk.entitySlices.length; ++k) { -+ chunk.entitySlices[k] = new EntitySlice(Entity.class); -+ } -+ // CraftBukkit end chunk.addEntities(); + + // CraftBukkit start @@ -191,7 +186,7 @@ chunk.loadNearby(this, this, i, j); } -@@ -96,12 +194,25 @@ +@@ -96,12 +189,25 @@ } public Chunk getOrCreateChunk(int i, int j) { @@ -220,7 +215,7 @@ if (this.chunkLoader == null) { return null; } else { -@@ -123,7 +234,7 @@ +@@ -123,7 +229,7 @@ } } @@ -229,7 +224,7 @@ if (this.chunkLoader != null) { try { this.chunkLoader.b(this.world, chunk); -@@ -134,7 +245,7 @@ +@@ -134,7 +240,7 @@ } } @@ -238,7 +233,7 @@ if (this.chunkLoader != null) { try { chunk.setLastSaved(this.world.getTime()); -@@ -155,6 +266,30 @@ +@@ -155,6 +261,30 @@ chunk.n(); if (this.chunkProvider != null) { this.chunkProvider.getChunkAt(ichunkprovider, i, j); @@ -269,7 +264,7 @@ chunk.e(); } } -@@ -174,10 +309,12 @@ +@@ -174,10 +304,12 @@ public boolean saveChunks(boolean flag, IProgressUpdate iprogressupdate) { int i = 0; @@ -285,7 +280,7 @@ if (flag) { this.saveChunkNOP(chunk); -@@ -205,22 +342,43 @@ +@@ -205,22 +337,43 @@ public boolean unloadChunks() { if (!this.world.savingDisabled) { @@ -336,7 +331,7 @@ if (this.chunkLoader != null) { this.chunkLoader.a(); -@@ -235,7 +393,8 @@ +@@ -235,7 +388,8 @@ } public String getName() { @@ -346,7 +341,7 @@ } public List<BiomeBase.BiomeMeta> getMobsFor(EnumCreatureType enumcreaturetype, BlockPosition blockposition) { -@@ -247,7 +406,8 @@ +@@ -247,7 +401,8 @@ } public int getLoadedChunks() { |