From 55ca46b38259c458097e492589b3a20b5198e3b4 Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 31 Dec 2012 01:20:35 -0500 Subject: [PATCH] Move server stopped *after* the server has actually stopped. *sigh* --- .../net/minecraft/server/MinecraftServer.java.patch | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch index 04ce78b8e..5c31ec5de 100644 --- a/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch +++ b/fml/patches/minecraft/net/minecraft/server/MinecraftServer.java.patch @@ -40,11 +40,8 @@ var48.printStackTrace(); field_71306_a.log(Level.SEVERE, "Encountered an unexpected exception " + var48.getClass().getSimpleName(), var48); CrashReport var2 = null; -@@ -453,8 +465,13 @@ - } - finally +@@ -455,6 +467,10 @@ { -+ FMLCommonHandler.instance().handleServerStopped(); try { + if (FMLCommonHandler.instance().shouldServerBeKilledQuietly()) @@ -54,6 +51,14 @@ this.func_71260_j(); this.field_71316_v = true; } +@@ -464,6 +480,7 @@ + } + finally + { ++ FMLCommonHandler.instance().handleServerStopped(); + this.func_71240_o(); + } + } @@ -480,8 +497,10 @@ public void func_71217_p()