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-06-07 15:12:51 +00:00
|
|
|
@@ -13,6 +13,9 @@
|
2012-03-30 17:33:29 +00:00
|
|
|
import java.util.Random;
|
|
|
|
import java.util.logging.Level;
|
|
|
|
import java.util.logging.Logger;
|
|
|
|
+
|
2012-06-07 15:12:51 +00:00
|
|
|
+import cpw.mods.fml.common.FMLCommonHandler;
|
2012-04-05 15:42:33 +00:00
|
|
|
+import cpw.mods.fml.server.FMLServerHandler;
|
2012-03-30 17:33:29 +00:00
|
|
|
import net.minecraft.src.AnvilSaveConverter;
|
|
|
|
import net.minecraft.src.AnvilSaveHandler;
|
|
|
|
import net.minecraft.src.AxisAlignedBB;
|
2012-06-07 15:12:51 +00:00
|
|
|
@@ -100,6 +103,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-05 15:42:33 +00:00
|
|
|
+ FMLServerHandler.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-06-07 15:12:51 +00:00
|
|
|
@@ -146,6 +150,7 @@
|
2012-04-02 22:09:06 +00:00
|
|
|
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-05 15:42:33 +00:00
|
|
|
+ FMLServerHandler.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);
|
2012-06-07 15:12:51 +00:00
|
|
|
@@ -487,7 +492,9 @@
|
|
|
|
this.field_6033_f.func_28169_a(new Packet4UpdateTime(var7.func_22080_k()), var7.field_4272_q.field_6165_g);
|
|
|
|
}
|
2012-04-11 02:22:13 +00:00
|
|
|
|
2012-06-07 15:12:51 +00:00
|
|
|
+ FMLServerHandler.instance().onPreWorldTick(var7);
|
|
|
|
var7.func_22077_g();
|
|
|
|
+ FMLServerHandler.instance().onPostWorldTick(var7);
|
2012-04-01 06:14:14 +00:00
|
|
|
|
2012-06-07 15:12:51 +00:00
|
|
|
while (true)
|
|
|
|
{
|