2012-03-31 00:43:58 +00:00
|
|
|
--- 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
|
2012-03-30 17:33:29 +00:00
|
|
|
@@ -13,6 +13,9 @@
|
|
|
|
|
import java.util.Random;
|
|
|
|
|
import java.util.logging.Level;
|
|
|
|
|
import java.util.logging.Logger;
|
|
|
|
|
+
|
|
|
|
|
+import fml.FMLHooks;
|
|
|
|
|
+import fml.obf.FMLHandler;
|
|
|
|
|
import net.minecraft.src.AnvilSaveConverter;
|
|
|
|
|
import net.minecraft.src.AnvilSaveHandler;
|
|
|
|
|
import net.minecraft.src.AxisAlignedBB;
|
2012-03-31 01:23:04 +00:00
|
|
|
@@ -144,6 +147,7 @@
|
2012-03-30 17:33:29 +00:00
|
|
|
var1.start();
|
|
|
|
|
ConsoleLogManager.init();
|
|
|
|
|
logger.info("Starting minecraft server version 1.2.4");
|
2012-03-31 01:23:04 +00:00
|
|
|
+ FMLHandler.INSTANCE.onPreLoad(this);
|
2012-03-30 17:33:29 +00:00
|
|
|
|
|
|
|
|
if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L)
|
2012-03-31 01:23:04 +00:00
|
|
|
{
|
2012-03-30 17:33:29 +00:00
|
|
|
@@ -190,6 +194,8 @@
|
|
|
|
|
logger.warning("To change this, set \"online-mode\" to \"true\" in the server.settings file.");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ FMLHandler.INSTANCE.onLoadComplete();
|
|
|
|
|
+
|
|
|
|
|
this.configManager = new ServerConfigurationManager(this);
|
|
|
|
|
this.entityTracker[0] = new EntityTracker(this, 0);
|
|
|
|
|
this.entityTracker[1] = new EntityTracker(this, -1);
|
|
|
|
|
@@ -433,6 +439,7 @@
|
|
|
|
|
var3 += var7;
|
|
|
|
|
var1 = var5;
|
|
|
|
|
|
|
|
|
|
+ FMLHandler.INSTANCE.onPreTick();
|
|
|
|
|
if (this.worldMngr[0].isAllPlayersFullyAsleep())
|
|
|
|
|
{
|
|
|
|
|
this.doTick();
|
|
|
|
|
@@ -446,6 +453,7 @@
|
|
|
|
|
this.doTick();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
+ FMLHandler.INSTANCE.onPostTick();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
