79 lines
2.5 KiB
Diff
79 lines
2.5 KiB
Diff
--- ../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.BehaviorArrowDispense;
|
|
@@ -382,7 +385,10 @@
|
|
{
|
|
if (this.func_71197_b())
|
|
{
|
|
+ FMLCommonHandler.instance().handleServerStarted();
|
|
long var1 = System.currentTimeMillis();
|
|
+
|
|
+ FMLCommonHandler.instance().onWorldLoadTick(field_71305_c);
|
|
|
|
for (long var50 = 0L; this.field_71317_u; this.field_71296_Q = true)
|
|
{
|
|
@@ -421,6 +427,7 @@
|
|
|
|
Thread.sleep(1L);
|
|
}
|
|
+ FMLCommonHandler.instance().handleServerStopping();
|
|
}
|
|
else
|
|
{
|
|
@@ -484,8 +491,10 @@
|
|
|
|
public void func_71217_p()
|
|
{
|
|
+ FMLCommonHandler.instance().rescheduleTicks(Side.SERVER);
|
|
long var1 = System.nanoTime();
|
|
AxisAlignedBB.func_72332_a().func_72298_a();
|
|
+ FMLCommonHandler.instance().onPreServerTick();
|
|
++this.field_71315_w;
|
|
|
|
if (this.field_71295_T)
|
|
@@ -531,6 +540,7 @@
|
|
|
|
this.field_71304_b.func_76319_b();
|
|
this.field_71304_b.func_76319_b();
|
|
+ FMLCommonHandler.instance().onPostServerTick();
|
|
}
|
|
|
|
public void func_71190_q()
|
|
@@ -558,6 +568,7 @@
|
|
}
|
|
|
|
this.field_71304_b.func_76320_a("tick");
|
|
+ FMLCommonHandler.instance().onPreWorldTick(var4);
|
|
CrashReport var6;
|
|
|
|
try
|
|
@@ -582,6 +593,7 @@
|
|
throw new ReportedException(var6);
|
|
}
|
|
|
|
+ FMLCommonHandler.instance().onPostWorldTick(var4);
|
|
this.field_71304_b.func_76319_b();
|
|
this.field_71304_b.func_76320_a("tracker");
|
|
var4.func_73039_n().func_72788_a();
|
|
@@ -1150,6 +1162,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
|