--- a/net/minecraft/server/dedicated/DedicatedServer.java +++ b/net/minecraft/server/dedicated/DedicatedServer.java @@ -97,6 +97,7 @@ public boolean func_71197_b() throws IOException { Thread thread = new Thread("Server console handler") { public void run() { + if (net.minecraftforge.server.console.TerminalHandler.handleCommands(DedicatedServer.this)) return; BufferedReader bufferedreader = new BufferedReader(new InputStreamReader(System.in, StandardCharsets.UTF_8)); String s3; @@ -118,6 +119,7 @@ field_155771_h.warn("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); } + net.minecraftforge.fml.server.ServerModLoader.begin(this); field_155771_h.info("Loading properties"); ServerProperties serverproperties = this.field_71340_o.func_219034_a(); if (this.func_71264_H()) { @@ -175,6 +177,7 @@ if (!PreYggdrasilConverter.func_219587_e(this)) { return false; } else { + net.minecraftforge.fml.server.ServerModLoader.end(); this.func_184105_a(new DedicatedPlayerList(this)); long i = Util.func_211178_c(); String s = serverproperties.field_219022_p; @@ -196,6 +199,7 @@ SkullTileEntity.func_184293_a(this.func_152358_ax()); SkullTileEntity.func_184294_a(this.func_147130_as()); PlayerProfileCache.func_187320_a(this.func_71266_T()); + if (!net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerAboutToStart(this)) return false; field_155771_h.info("Preparing level \"{}\"", (Object)this.func_71270_I()); JsonObject jsonobject = new JsonObject(); if (worldtype == WorldType.field_77138_c) { @@ -208,6 +212,7 @@ long l = Util.func_211178_c() - i; String s2 = String.format(Locale.ROOT, "%.3fs", (double)l / 1.0E9D); field_155771_h.info("Done ({})! For help, type \"help\"", (Object)s2); + this.field_211151_aa = Util.func_211177_b(); //Forge: Update server time to prevent watchdog/spaming during long load. if (serverproperties.field_219027_u != null) { this.func_200252_aR().func_223585_a(GameRules.field_223620_w).func_223570_a(serverproperties.field_219027_u, this); } @@ -233,7 +238,8 @@ } Items.field_190931_a.func_150895_a(ItemGroup.field_78027_g, NonNullList.func_191196_a()); - return true; + // <3 you Grum for this, saves us ~30 patch files! --^ + return net.minecraftforge.fml.server.ServerLifecycleHooks.handleServerStarting(this); } } @@ -547,4 +553,9 @@ public boolean func_213199_b(GameProfile p_213199_1_) { return false; } + + @Override //Forge: Enable formated text for colors in console. + public void func_145747_a(net.minecraft.util.text.ITextComponent message) { + field_155771_h.info(message.func_150254_d()); + } }