summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorTahg <tahgtahv@gmail.com>2011-08-19 23:17:48 -0400
committerTahg <tahgtahv@gmail.com>2011-08-19 23:17:48 -0400
commit6e4b12cdf1f9b7fea617b54f0b7e0d083f4432a0 (patch)
tree2fda210b2e7ff9237d89c1dc7d657d9e359c8427 /src/main
parent90d1afb748223366ae16cd05da13683aeb861a99 (diff)
downloadcraftbukkit-6e4b12cdf1f9b7fea617b54f0b7e0d083f4432a0.tar
craftbukkit-6e4b12cdf1f9b7fea617b54f0b7e0d083f4432a0.tar.gz
craftbukkit-6e4b12cdf1f9b7fea617b54f0b7e0d083f4432a0.tar.lz
craftbukkit-6e4b12cdf1f9b7fea617b54f0b7e0d083f4432a0.tar.xz
craftbukkit-6e4b12cdf1f9b7fea617b54f0b7e0d083f4432a0.zip
safety check (and hopeful fix) for chunk saving
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java5
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftWorld.java2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index c1f13d0c..c232801a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -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()) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index ed09f0f3..23d45a6d 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -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);