summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEvilSeph <evilseph@unaligned.org>2011-05-26 17:29:57 -0400
committerEvilSeph <evilseph@unaligned.org>2011-05-26 17:29:57 -0400
commit036f49ddbfedd06306a6f9ea44de9dc6da72baf2 (patch)
tree63d6bb0704152235371806e1aacbed1d01a1e0ea /src
parent9934dd8561d268a78577b5475df5fb72756c32ef (diff)
downloadcraftbukkit-036f49ddbfedd06306a6f9ea44de9dc6da72baf2.tar
craftbukkit-036f49ddbfedd06306a6f9ea44de9dc6da72baf2.tar.gz
craftbukkit-036f49ddbfedd06306a6f9ea44de9dc6da72baf2.tar.lz
craftbukkit-036f49ddbfedd06306a6f9ea44de9dc6da72baf2.tar.xz
craftbukkit-036f49ddbfedd06306a6f9ea44de9dc6da72baf2.zip
Fixed the Bukkit Scheduler.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/MinecraftServer.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index e2a32bea..aa2573e3 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -242,7 +242,7 @@ public class MinecraftServer implements Runnable, ICommandListener {
WorldSaveEvent event = new WorldSaveEvent(worldserver.getWorld());
server.getPluginManager().callEvent(event);
}
-
+
WorldServer world = this.worlds.get(0);
if (!world.E) {
this.serverConfigurationManager.savePlayers();
@@ -379,9 +379,11 @@ public class MinecraftServer implements Runnable, ICommandListener {
EntityPlayer entityplayer = (EntityPlayer) this.serverConfigurationManager.players.get(i);
entityplayer.netServerHandler.sendPacket(new Packet4UpdateTime(entityplayer.world.getTime()));
}
- // Craftbukkit end
}
+ ((CraftScheduler) server.getScheduler()).mainThreadHeartbeat(this.ticks);
+ // Craftbukkit end
+
worldserver.doTick();
while (worldserver.doLighting()) {