--- src-reference/minecraft_server/net/minecraft/server/MinecraftServer.java	0000-00-00 00:00:00.000000000 -0000
+++ src-work/minecraft_server/net/minecraft/server/MinecraftServer.java	0000-00-00 00:00:00.000000000 -0000
@@ -13,6 +13,8 @@
 import java.util.Random;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+
+import cpw.mods.fml.server.FMLHandler;
 import net.minecraft.src.AnvilSaveConverter;
 import net.minecraft.src.AnvilSaveHandler;
 import net.minecraft.src.AxisAlignedBB;
@@ -100,6 +102,7 @@
         var1.start();
         ConsoleLogManager.func_641_a();
         field_6038_a.info("Starting minecraft server version 1.2.5");
+        FMLHandler.INSTANCE.onPreLoad(this);
 
         if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L)
         {
@@ -146,6 +149,7 @@
             field_6038_a.warning("To change this, set \"online-mode\" to \"true\" in the server.settings file.");
         }
 
+        FMLHandler.INSTANCE.onLoadComplete();
         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);
@@ -370,6 +374,7 @@
                         var7 = 0L;
                     }
 
+                    FMLHandler.INSTANCE.onPreTick();
                     var3 += var7;
                     var1 = var5;
 
@@ -386,6 +391,7 @@
                             this.func_6018_h();
                         }
                     }
+                    FMLHandler.INSTANCE.onPostTick();
                 }
             }
             else