--- ../src-base/common/net/minecraft/server/MinecraftServer.java
+++ ../src-work/common/net/minecraft/server/MinecraftServer.java
@@ -13,6 +13,9 @@
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import cpw.mods.fml.common.FMLCommonHandler;
+import cpw.mods.fml.relauncher.ArgsWrapper;
+import cpw.mods.fml.relauncher.FMLRelauncher;
 import net.minecraft.src.AnvilSaveConverter;
 import net.minecraft.src.AxisAlignedBB;
 import net.minecraft.src.CallableIsServerModded;
@@ -362,8 +365,10 @@
     {
         try
         {
+            FMLCommonHandler.instance().handleServerStarting(this);
             if (this.func_71197_b())
             {
+                FMLCommonHandler.instance().handleServerStarted();
                 long var1 = System.currentTimeMillis();
 
                 for (long var50 = 0L; this.field_71317_u; this.field_71296_Q = true)
@@ -403,6 +408,7 @@
 
                     Thread.sleep(1L);
                 }
+                FMLCommonHandler.instance().handleServerStopping();
             }
             else
             {
@@ -593,6 +599,12 @@
     @SideOnly(Side.SERVER)
     public static void main(String[] p_main_0_)
     {
+        FMLRelauncher.handleServerRelaunch(new ArgsWrapper(p_main_0_));
+    }
+    @SideOnly(Side.SERVER)
+    public static void fmlReentry(ArgsWrapper wrap)
+    {
+        String[] p_main_0_ = wrap.args;
         StatList.func_75919_a();
 
         try