582a785fb8
A lot of patches went in - the client and server both launch and start up mods.
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
--- ../src-base/minecraft_server/net/minecraft/server/MinecraftServer.java
|
|
+++ ../src-work/minecraft_server/net/minecraft/server/MinecraftServer.java
|
|
@@ -11,6 +11,11 @@
|
|
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 cpw.mods.fml.server.FMLServerHandler;
|
|
import net.minecraft.src.AnvilSaveConverter;
|
|
import net.minecraft.src.AxisAlignedBB;
|
|
import net.minecraft.src.CallableIsServerModded;
|
|
@@ -351,8 +356,12 @@
|
|
{
|
|
try
|
|
{
|
|
+ FMLServerHandler.instance().beginServerLoading(this);
|
|
+ FMLServerHandler.instance().finishServerLoading();
|
|
+ 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)
|
|
@@ -392,6 +401,7 @@
|
|
|
|
Thread.sleep(1L);
|
|
}
|
|
+ FMLCommonHandler.instance().handleServerStopping();
|
|
}
|
|
else
|
|
{
|
|
@@ -580,6 +590,11 @@
|
|
|
|
public static void main(String[] p_main_0_)
|
|
{
|
|
+ FMLRelauncher.handleServerRelaunch(new ArgsWrapper(p_main_0_));
|
|
+ }
|
|
+ public static void fmlReentry(ArgsWrapper wrap)
|
|
+ {
|
|
+ String[] p_main_0_ = wrap.args;
|
|
StatList.func_75919_a();
|
|
|
|
try
|