diff --git a/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch b/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch index cdf54240fb..56ec29c8af 100644 --- a/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch +++ b/patches/minecraft_server/net/minecraft/server/MinecraftServer.java.patch @@ -26,7 +26,16 @@ this.field_6033_f = new ServerConfigurationManager(this); this.field_6028_k[0] = new EntityTracker(this, 0); this.field_6028_k[1] = new EntityTracker(this, -1); -@@ -447,6 +452,7 @@ +@@ -353,6 +358,8 @@ + { + long var1 = System.currentTimeMillis(); + ++ FMLServerHandler.instance().onWorldLoadTick(); ++ + for (long var3 = 0L; this.field_6025_n; Thread.sleep(1L)) + { + long var5 = System.currentTimeMillis(); +@@ -447,6 +454,7 @@ long var1 = System.nanoTime(); ArrayList var3 = new ArrayList(); Iterator var4 = field_6037_b.keySet().iterator(); @@ -34,7 +43,7 @@ while (var4.hasNext()) { -@@ -487,7 +493,9 @@ +@@ -487,7 +495,9 @@ this.field_6033_f.func_28169_a(new Packet4UpdateTime(var7.func_22080_k()), var7.field_4272_q.field_6165_g); } @@ -44,7 +53,7 @@ while (true) { -@@ -533,6 +541,7 @@ +@@ -533,6 +543,7 @@ this.field_48076_G = Packet.field_48101_l; this.field_48082_x[this.field_9014_h % 100] = Packet.field_48102_m - this.field_48077_H; this.field_48077_H = Packet.field_48102_m; diff --git a/server/cpw/mods/fml/server/FMLServerHandler.java b/server/cpw/mods/fml/server/FMLServerHandler.java index 66ea32043d..b23789473b 100644 --- a/server/cpw/mods/fml/server/FMLServerHandler.java +++ b/server/cpw/mods/fml/server/FMLServerHandler.java @@ -172,6 +172,10 @@ public class FMLServerHandler implements IFMLSidedHandler FMLCommonHandler.instance().tickEnd(EnumSet.of(TickType.WORLD), world); } + public void onWorldLoadTick() + { + FMLCommonHandler.instance().tickStart(EnumSet.of(TickType.WORLDLOAD)); + } /** * Get the server instance *