Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-13 19:11:43 +01:00
Code Issues Projects Releases Wiki Activity

Fix issues with chunk saving. Fixes BUKKIT-2158, BUKKIT-2018 and BUKKIT-2229

Browse Source 
By: Mike Primm <mike@primmhome.com>
This commit is contained in:
CraftBukkit/Spigot 2012-08-12 18:40:49 -05:00
parent 84483a55f2
commit 4c88eae55b
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,9 +161,11 @@ public class CraftWorld implements World {
} }
net.minecraft.server.Chunk chunk = world.chunkProviderServer.getOrCreateChunk(x, z); net.minecraft.server.Chunk chunk = world.chunkProviderServer.getOrCreateChunk(x, z);
if (chunk.mustSave) { // If chunk had previously been queued to save, must do save to avoid loss of that data
save = true;
}
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)) {
chunk.removeEntities();
world.chunkProviderServer.saveChunk(chunk); world.chunkProviderServer.saveChunk(chunk);
world.chunkProviderServer.saveChunkNOP(chunk); world.chunkProviderServer.saveChunkNOP(chunk);
} }
@ -216,22 +218,7 @@ public class CraftWorld implements World {
} }
public boolean isChunkInUse(int x, int z) { public boolean isChunkInUse(int x, int z) {
Player[] players = server.getOnlinePlayers(); return world.getPlayerManager().isChunkInUse(x, z);
for (Player player : players) {
Location loc = player.getLocation();
if (loc.getWorld() != world.chunkProviderServer.world.getWorld()) {
continue;
}
// If the chunk is within 256 blocks of a player, refuse to accept the unload request
// This is larger than the distance of loaded chunks that actually surround a player
// The player is the center of a 21x21 chunk grid, so the edge is 10 chunks (160 blocks) away from the player
if (Math.abs(loc.getBlockX() - (x << 4)) <= 256 && Math.abs(loc.getBlockZ() - (z << 4)) <= 256) {
return true;
}
}
return false;
} }
public boolean loadChunk(int x, int z, boolean generate) { public boolean loadChunk(int x, int z, boolean generate) {