SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Bleeding] Remove redundant chunkList from ChunkProviderServer

Browse Source 
This ArrayList duplicates part of the functionality of the much more
efficient chunk map so can be removed as the map can be used in the few
places this was needed.

By: Mike Primm <mike@primmhome.com>
This commit is contained in:
CraftBukkit/Spigot
2012-08-11 17:34:22 -05:00
parent 327e789c7f
commit 4ada047593
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@@ -164,7 +164,9 @@ public class CraftWorld implements World {
if (chunk.mustSave) { // If chunk had previously been queued to save, must do save to avoid loss of that data if (chunk.mustSave) { // If chunk had previously been queued to save, must do save to avoid loss of that data
save = true; save = true;
} }
chunk.removeEntities(); // Always remove entities - even if discarding, need to get them out of world table chunk.removeEntities(); // Always remove entities - even if discarding, need to get them out of world table
if (save && !(chunk instanceof EmptyChunk)) { if (save && !(chunk instanceof EmptyChunk)) {
world.chunkProviderServer.saveChunk(chunk); world.chunkProviderServer.saveChunk(chunk);
world.chunkProviderServer.saveChunkNOP(chunk); world.chunkProviderServer.saveChunkNOP(chunk);
@@ -172,7 +174,6 @@ public class CraftWorld implements World {
world.chunkProviderServer.unloadQueue.remove(x, z); world.chunkProviderServer.unloadQueue.remove(x, z);
world.chunkProviderServer.chunks.remove(x, z); world.chunkProviderServer.chunks.remove(x, z);
world.chunkProviderServer.chunkList.remove(chunk);
return true; return true;
} }
@@ -242,7 +243,6 @@ public class CraftWorld implements World {
private void chunkLoadPostProcess(net.minecraft.server.Chunk chunk, int x, int z) { private void chunkLoadPostProcess(net.minecraft.server.Chunk chunk, int x, int z) {
if (chunk != null) { if (chunk != null) {
world.chunkProviderServer.chunks.put(x, z, chunk); world.chunkProviderServer.chunks.put(x, z, chunk);
world.chunkProviderServer.chunkList.add(chunk);
chunk.addEntities(); chunk.addEntities();