Merge pull request #36 from cpw/master

Update to fml 58, separate the "register" and "announce to mods" phases of login

forge/forge_server/src/net/minecraft/src/forge/PacketHandlerServer.java

@@ -10,6 +10,8 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.logging.Level;
 
+import cpw.mods.fml.server.FMLServerHandler;
+
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.src.*;
 import net.minecraft.src.forge.packets.*;
@@ -158,5 +160,6 @@ public class PacketHandlerServer implements IPacketHandler
         }
         
         player.func_20057_k();
+        FMLServerHandler.instance().announceLogin(player);
     }
 }

forge/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch

@@ -36,13 +36,15 @@
              var5.sendPacket(new Packet4UpdateTime(var3.getWorldTime()));
              Iterator var6 = var2.getActivePotionEffects().iterator();
  
-@@ -166,7 +173,8 @@
+@@ -166,9 +173,10 @@
              }
  
              var2.func_20057_k();
--            
 +            */
 +            ForgeHooksServer.handleLoginPacket(par1Packet1Login, var5, netManager);
-             FMLServerHandler.instance().handleLogin(par1Packet1Login, netManager, var2);
+             
+             FMLServerHandler.instance().handleLogin(par1Packet1Login, netManager);
+-            FMLServerHandler.instance().announceLogin(var2);
          }
  
+         this.finishedProcessing = true;