2012-04-05 07:10:13 +00:00
|
|
|
--- ../src-base/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-04-02 22:09:06 +00:00
|
|
|
@@ -13,6 +13,8 @@
|
2012-03-30 17:33:29 +00:00
|
|
|
import java.util.Random;
|
|
|
|
import java.util.logging.Level;
|
|
|
|
import java.util.logging.Logger;
|
|
|
|
+
|
2012-04-02 22:09:06 +00:00
|
|
|
+import cpw.mods.fml.server.FMLHandler;
|
2012-03-30 17:33:29 +00:00
|
|
|
import net.minecraft.src.AnvilSaveConverter;
|
|
|
|
import net.minecraft.src.AnvilSaveHandler;
|
|
|
|
import net.minecraft.src.AxisAlignedBB;
|
2012-04-02 22:09:06 +00:00
|
|
|
@@ -100,6 +102,7 @@
|
2012-03-30 17:33:29 +00:00
|
|
|
var1.start();
|
2012-04-02 22:09:06 +00:00
|
|
|
ConsoleLogManager.func_641_a();
|
|
|
|
field_6038_a.info("Starting minecraft server version 1.2.5");
|
2012-04-03 03:06:30 +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-04-02 22:09:06 +00:00
|
|
|
@@ -146,6 +149,7 @@
|
|
|
|
field_6038_a.warning("To change this, set \"online-mode\" to \"true\" in the server.settings file.");
|
2012-03-30 17:33:29 +00:00
|
|
|
}
|
|
|
|
|
2012-04-03 03:06:30 +00:00
|
|
|
+ FMLHandler.instance().onLoadComplete();
|
2012-04-02 22:09:06 +00:00
|
|
|
this.field_6033_f = new ServerConfigurationManager(this);
|
|
|
|
this.field_6028_k[0] = new EntityTracker(this, 0);
|
|
|
|
this.field_6028_k[1] = new EntityTracker(this, -1);
|
|
|
|
@@ -370,6 +374,7 @@
|
2012-04-01 06:14:14 +00:00
|
|
|
var7 = 0L;
|
|
|
|
}
|
|
|
|
|
2012-04-03 03:06:30 +00:00
|
|
|
+ FMLHandler.instance().onPreTick();
|
2012-03-30 17:33:29 +00:00
|
|
|
var3 += var7;
|
|
|
|
var1 = var5;
|
|
|
|
|
2012-04-02 22:09:06 +00:00
|
|
|
@@ -386,6 +391,7 @@
|
|
|
|
this.func_6018_h();
|
2012-03-30 17:33:29 +00:00
|
|
|
}
|
|
|
|
}
|
2012-04-03 03:06:30 +00:00
|
|
|
+ FMLHandler.instance().onPostTick();
|
2012-03-30 17:33:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|