From c13502c690ec3e046d967573a520551b4a8506ee Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 22 Jan 2013 09:32:53 -0500 Subject: [PATCH] Remember to add the new patches! --- .../server/dedicated/DedicatedServer.java.patch | 16 ++++++++++++---- .../integrated/IntegratedServer.java.patch | 10 +++++++--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch b/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch index d17617ed1..de704ff6c 100644 --- a/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch @@ -25,12 +25,20 @@ this.func_71210_a(new DedicatedPlayerList(this)); long var4 = System.nanoTime(); -@@ -187,6 +192,8 @@ +@@ -167,6 +172,7 @@ + this.func_71191_d((this.func_71207_Z() + 8) / 16 * 16); + this.func_71191_d(MathHelper.func_76125_a(this.func_71207_Z(), 64, 256)); + this.field_71340_o.func_73667_a("max-build-height", Integer.valueOf(this.func_71207_Z())); ++ if (!FMLCommonHandler.instance().handleServerAboutToStart(this)) { return false; } + field_71306_a.info("Preparing level \"" + this.func_71270_I() + "\""); + this.func_71247_a(this.func_71270_I(), this.func_71270_I(), var9, var17, var8); + long var12 = System.nanoTime() - var4; +@@ -187,7 +193,7 @@ this.field_71339_n.func_72602_a(); } -+ FMLCommonHandler.instance().handleServerStarting(this); -+ - return true; +- return true; ++ return FMLCommonHandler.instance().handleServerStarting(this); } + public boolean func_71225_e() diff --git a/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch b/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch index 09c1e5c3c..9cce851ea 100644 --- a/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch @@ -7,11 +7,15 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import java.io.File; -@@ -110,6 +111,7 @@ +@@ -108,9 +109,10 @@ + this.func_71245_h(true); + field_71306_a.info("Generating keypair"); this.func_71253_a(CryptManager.func_75891_b()); ++ if (!FMLCommonHandler.instance().handleServerAboutToStart(this)) { return false; } this.func_71247_a(this.func_71270_I(), this.func_71221_J(), this.field_71350_m.func_77160_d(), this.field_71350_m.func_77165_h(), this.field_71350_m.func_82749_j()); this.func_71205_p(this.func_71214_G() + " - " + this.field_71305_c[0].func_72912_H().func_76065_j()); -+ FMLCommonHandler.instance().handleServerStarting(this); - return true; +- return true; ++ return FMLCommonHandler.instance().handleServerStarting(this); } + public void func_71217_p()