AllowPlayerLogins only after the server has completed the core init tasks. Closes #372

fml/patches/minecraft/net/minecraft/server/dedicated/DedicatedServer.java.patch

@@ -40,12 +40,11 @@
                  field_155771_h.info("Preparing level \"" + this.func_71270_I() + "\"");
                  this.func_71247_a(this.func_71270_I(), this.func_71270_I(), k, worldtype, s2);
                  long i1 = System.nanoTime() - j;
-@@ -268,7 +274,8 @@
+@@ -268,7 +274,7 @@
                      this.field_71339_n.func_72602_a();
                  }
  
 -                return true;
-+                allowPlayerLogins = true;
 +                return FMLCommonHandler.instance().handleServerStarting(this);
              }
          }

fml/src/main/java/cpw/mods/fml/client/FMLClientHandler.java

@@ -146,7 +146,7 @@ public class FMLClientHandler implements IFMLSidedHandler
 
     private CustomModLoadingErrorDisplayException customError;
 
-	private DuplicateModsFoundException dupesFound;
+    private DuplicateModsFoundException dupesFound;
 
     private boolean serverShouldBeKilledQuietly;
 
@@ -209,7 +209,7 @@ public class FMLClientHandler implements IFMLSidedHandler
         }
         catch (DuplicateModsFoundException dupes)
         {
-        	dupesFound = dupes;
+            dupesFound = dupes;
         }
         catch (MissingModsException missing)
         {
@@ -371,9 +371,9 @@ public class FMLClientHandler implements IFMLSidedHandler
         {
             showGuiScreen(new GuiSortingProblem(modSorting));
         }
-		else if (customError != null)
+        else if (customError != null)
         {
-		    showGuiScreen(new GuiCustomModLoadingErrorScreen(customError));
+            showGuiScreen(new GuiCustomModLoadingErrorScreen(customError));
         }
         else
         {
@@ -870,4 +870,9 @@ public class FMLClientHandler implements IFMLSidedHandler
     {
         return true; //Always true as the server has to be started before clicking 'Open to lan'
     }
+    
+    @Override
+    public void allowLogins() {
+        // NOOP for integrated server
+    }
 }

fml/src/main/java/cpw/mods/fml/common/FMLCommonHandler.java

@@ -215,7 +215,7 @@ public class FMLCommonHandler
             }
             if (sidedDelegate!=null)
             {
-            	brd.addAll(sidedDelegate.getAdditionalBrandingInformation());
+                brd.addAll(sidedDelegate.getAdditionalBrandingInformation());
             }
             if (Loader.instance().getFMLBrandingProperties().containsKey("fmlbranding"))
             {
@@ -281,6 +281,7 @@ public class FMLCommonHandler
     public void handleServerStarted()
     {
         Loader.instance().serverStarted();
+        sidedDelegate.allowLogins();
     }
 
     public void handleServerStopping()

fml/src/main/java/cpw/mods/fml/common/IFMLSidedHandler.java

@@ -59,4 +59,6 @@ public interface IFMLSidedHandler
     void fireNetRegistrationEvent(EventBus bus, NetworkManager manager, Set<String> channelSet, String channel, Side side);
 
     boolean shouldAllowPlayerLogins();
+
+    void allowLogins();
 }

fml/src/main/java/cpw/mods/fml/server/FMLServerHandler.java

@@ -259,4 +259,9 @@ public class FMLServerHandler implements IFMLSidedHandler
     {
         return DedicatedServer.allowPlayerLogins;
     }
+    
+    @Override
+    public void allowLogins() {
+        DedicatedServer.allowPlayerLogins = true;
+    }
 }