From 2ff2a78694b328e0643733e092d2e7609d3c62b8 Mon Sep 17 00:00:00 2001
From: Christian Weeks <cpw@weeksfamily.ca>
Date: Sun, 8 Apr 2012 00:18:37 -0400
Subject: [PATCH] Split the packet salutation in two so we can work with or
 without forge

---
 .../minecraft/src/NetLoginHandler.java.patch  |  5 +++--
 .../cpw/mods/fml/server/FMLServerHandler.java | 19 ++++++++++---------
 server/net/minecraft/src/BaseMod.java         |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch b/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch
index b386965c17..c26a35f50d 100644
--- a/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch
+++ b/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch
@@ -9,12 +9,13 @@
  import net.minecraft.server.MinecraftServer;
  
  public class NetLoginHandler extends NetHandler
-@@ -132,6 +134,8 @@
+@@ -132,6 +134,9 @@
              }
  
              var2.func_20057_k();
 +            
-+            FMLServerHandler.instance().handleLogin(p_6007_1_, field_8_b, var2);
++            FMLServerHandler.instance().handleLogin(p_6007_1_, field_8_b);
++            FMLServerHandler.instance().announceLogin(var2);
          }
  
          this.field_7_c = true;
diff --git a/server/cpw/mods/fml/server/FMLServerHandler.java b/server/cpw/mods/fml/server/FMLServerHandler.java
index f4bb4f35f9..d4090db4d6 100644
--- a/server/cpw/mods/fml/server/FMLServerHandler.java
+++ b/server/cpw/mods/fml/server/FMLServerHandler.java
@@ -393,16 +393,8 @@ public class FMLServerHandler implements IFMLSidedHandler
      * @param loginPacket
      * @param networkManager
      */
-    public void handleLogin(Packet1Login loginPacket, NetworkManager networkManager, EntityPlayer player)
+    public void handleLogin(Packet1Login loginPacket, NetworkManager networkManager)
     {
-        for (ModContainer mod : Loader.getModList())
-        {
-            if (mod.wantsNetworkPackets())
-            {
-                mod.getNetworkHandler().onLogin(loginPacket, networkManager, player);
-            }
-        }
-
         Packet250CustomPayload packet = new Packet250CustomPayload();
         packet.field_44005_a = "REGISTER";
         packet.field_44004_c = FMLCommonHandler.instance().getPacketRegistry();
@@ -410,6 +402,15 @@ public class FMLServerHandler implements IFMLSidedHandler
         networkManager.func_745_a(packet);
     }
 
+    public void announceLogin(EntityPlayer player) {
+        for (ModContainer mod : Loader.getModList())
+        {
+            if (mod.wantsNetworkPackets())
+            {
+                mod.getNetworkHandler().onLogin(player);
+            }
+        }
+    }
     /**
      * Are we a server?
      */
diff --git a/server/net/minecraft/src/BaseMod.java b/server/net/minecraft/src/BaseMod.java
index c42d9ce16e..0aa1d3cac1 100644
--- a/server/net/minecraft/src/BaseMod.java
+++ b/server/net/minecraft/src/BaseMod.java
@@ -49,7 +49,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
     @Override
     public final void onLogin(Object... data)
     {
-        onClientLogin((Packet1Login)data[0], (NetworkManager)data[1], (EntityPlayer) data[2]);
+        onClientLogin((EntityPlayer) data[0]);
     }
 
     @Override
@@ -252,7 +252,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
      * @param data
      * @param player 
      */
-    public void onClientLogin(Packet1Login login, NetworkManager data, EntityPlayer player)
+    public void onClientLogin(EntityPlayer player)
     {
     }