diff --git a/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch
index 17b4ce466..b4915dd2d 100644
--- a/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch
+++ b/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch
@@ -85,3 +85,11 @@
          return this.field_71349_l.field_71441_e.func_72912_H().func_176130_y();
      }
  
+@@ -357,6 +336,7 @@
+ 
+     public void func_71263_m()
+     {
++        if (func_71278_l())
+         Futures.getUnchecked(this.func_152344_a(new Runnable()
+         {
+             public void run()
diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
index a261cd35b..3107dccd5 100644
--- a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
+++ b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
@@ -656,7 +656,7 @@ public class FMLClientHandler implements IFMLSidedHandler
 
         if (server != null && !server.serverIsInRunLoop())
         {
-            ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, true, "field_71296"+"_Q","serverIs"+"Running");
+//            ObfuscationReflectionHelper.setPrivateValue(MinecraftServer.class, server, true, "field_71296"+"_Q","serverIs"+"Running");
         }
     }
 
diff --git a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
index 7e5377480..da64ad986 100644
--- a/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
+++ b/src/main/java/net/minecraftforge/fml/common/registry/PersistentRegistryManager.java
@@ -210,7 +210,10 @@ public class PersistentRegistryManager
 
             boolean confirmed = StartupQuery.confirm(text);
             if (!confirmed)
+            {
                 StartupQuery.abort();
+                ;
+            }
         }
 
         // Load the snapshot into the "STAGING" registry