ForgePatch/fml/patches/common/net/minecraft/server/MinecraftServer.java.patch
Christian 3c1b234a61 Fix up MCP merger - it definitely works now - the game runs and runs well.
Fix up a couple of small network related issues.
Fix up the server launching fml properly.
2012-08-10 10:03:33 -04:00

41 lines
1.3 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.CallableIsServerModded;
@@ -364,6 +367,7 @@
{
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 +407,7 @@
Thread.sleep(1L);
}
+ FMLCommonHandler.instance().handleServerStopping();
}
else
{
@@ -1117,6 +1122,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