I'm quite aware that I fail at merging.

This commit is contained in:
Dinnerbone
2011-02-07 01:59:06 +00:00
parent 919023fe5d
commit 172db788b3
2 changed files with 14 additions and 8 deletions

View File

@@ -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