safety check (and hopeful fix) for chunk saving

This commit is contained in:
Tahg 2011-08-19 23:17:48 -04:00
parent 90d1afb748
commit 6e4b12cdf1
2 changed files with 3 additions and 4 deletions

View File

@ -425,7 +425,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
Vec3D.a();
++this.ticks;
((CraftScheduler) this.server.getScheduler()).mainThreadHeartbeat(this.ticks);
((CraftScheduler) this.server.getScheduler()).mainThreadHeartbeat(this.ticks); // CraftBukkit
for (j = 0; j < this.worlds.size(); ++j) { // CraftBukkit
// if (j == 0 || this.propertyManager.getBoolean("allow-nether", true)) { // CraftBukkit
@ -437,10 +437,9 @@ public class MinecraftServer implements Runnable, ICommandListener {
EntityPlayer entityplayer = (EntityPlayer) this.serverConfigurationManager.players.get(i);
entityplayer.netServerHandler.sendPacket(new Packet4UpdateTime(entityplayer.getPlayerTime())); // Add support for per player time
}
// CraftBukkit end
}
// CraftBukkit end
worldserver.doTick();
while (worldserver.doLighting()) {

View File

@ -153,7 +153,7 @@ public class CraftWorld implements World {
net.minecraft.server.Chunk chunk = world.chunkProviderServer.getOrCreateChunk(x, z);
if (save) {
if (save && !chunk.isEmpty()) {
chunk.removeEntities();
world.chunkProviderServer.saveChunk(chunk);
world.chunkProviderServer.saveChunkNOP(chunk);