From 4df55f3bd3c15213abebf0b3df3960900f451d1c Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Sun, 29 Apr 2018 17:57:33 -0700
Subject: [PATCH] Only revert to frozen data on server shutdown on client.
 Should fix race condition exposed by #4904

---
 .../java/net/minecraftforge/fml/client/FMLClientHandler.java    | 2 ++
 src/main/java/net/minecraftforge/fml/common/Loader.java         | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
index 32e3bb7e2b..6dbedb119a 100644
--- a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
+++ b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
@@ -705,6 +705,8 @@ public class FMLClientHandler implements IFMLSidedHandler
         {
 //            ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, true, "field_71296"+"_Q","serverIs"+"Running");
         }
+
+        GameData.revertToFrozen();
     }
 
     @Override
diff --git a/src/main/java/net/minecraftforge/fml/common/Loader.java b/src/main/java/net/minecraftforge/fml/common/Loader.java
index 4617283d2d..95c182a4bb 100644
--- a/src/main/java/net/minecraftforge/fml/common/Loader.java
+++ b/src/main/java/net/minecraftforge/fml/common/Loader.java
@@ -864,7 +864,6 @@ public class Loader
 
     public void serverStopped()
     {
-        GameData.revertToFrozen();
         modController.distributeStateMessage(LoaderState.SERVER_STOPPED);
         modController.transition(LoaderState.SERVER_STOPPED, true);
         modController.transition(LoaderState.AVAILABLE, true);