diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-07 01:59:06 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-07 01:59:06 +0000 |
commit | 172db788b329857b2ae4f771b3da9aa454ea548f (patch) | |
tree | c250e0a4286d55b2f2749da590a51f4dd9de4617 /src/main/java/net/minecraft/server/MinecraftServer.java | |
parent | 919023fe5da4e60ba708c692f9d12d337dc98b0f (diff) | |
download | craftbukkit-172db788b329857b2ae4f771b3da9aa454ea548f.tar craftbukkit-172db788b329857b2ae4f771b3da9aa454ea548f.tar.gz craftbukkit-172db788b329857b2ae4f771b3da9aa454ea548f.tar.lz craftbukkit-172db788b329857b2ae4f771b3da9aa454ea548f.tar.xz craftbukkit-172db788b329857b2ae4f771b3da9aa454ea548f.zip |
I'm quite aware that I fail at merging.
Diffstat (limited to 'src/main/java/net/minecraft/server/MinecraftServer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/MinecraftServer.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 716f3a73..23ef042b 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -293,6 +293,8 @@ public class MinecraftServer implements ICommandListener, Runnable { entityplayer.a.b((Packet) (new Packet4UpdateTime(entityplayer.world.e))); } } + + ((CraftScheduler) server.getScheduler()).mainThreadHeartbeat(this.h); for (WorldServer world : worlds) { world.f(); @@ -300,12 +302,7 @@ public class MinecraftServer implements ICommandListener, Runnable { while (world.d()) { ; } - - ; - ((CraftScheduler) server.getScheduler()).mainThreadHeartbeat(this.h); - - while (this.e.d()) { - ; + world.c(); } // Craftbukkit end |