diff --git a/fml/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch b/fml/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch index 86116f6c0..b386965c1 100644 --- a/fml/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch +++ b/fml/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch @@ -14,7 +14,7 @@ var2.func_20057_k(); + -+ FMLServerHandler.instance().handleLogin(p_6007_1_, field_8_b); ++ FMLServerHandler.instance().handleLogin(p_6007_1_, field_8_b, var2); } this.field_7_c = true; diff --git a/fml/server/cpw/mods/fml/server/FMLServerHandler.java b/fml/server/cpw/mods/fml/server/FMLServerHandler.java index 62e718e5e..f4bb4f35f 100644 --- a/fml/server/cpw/mods/fml/server/FMLServerHandler.java +++ b/fml/server/cpw/mods/fml/server/FMLServerHandler.java @@ -393,13 +393,13 @@ public class FMLServerHandler implements IFMLSidedHandler * @param loginPacket * @param networkManager */ - public void handleLogin(Packet1Login loginPacket, NetworkManager networkManager) + public void handleLogin(Packet1Login loginPacket, NetworkManager networkManager, EntityPlayer player) { for (ModContainer mod : Loader.getModList()) { if (mod.wantsNetworkPackets()) { - mod.getNetworkHandler().onLogin(loginPacket, networkManager); + mod.getNetworkHandler().onLogin(loginPacket, networkManager, player); } } diff --git a/fml/server/net/minecraft/src/BaseMod.java b/fml/server/net/minecraft/src/BaseMod.java index 0e2155d0a..c42d9ce16 100644 --- a/fml/server/net/minecraft/src/BaseMod.java +++ b/fml/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]); + onClientLogin((Packet1Login)data[0], (NetworkManager)data[1], (EntityPlayer) data[2]); } @Override @@ -250,8 +250,9 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp * Called when a new client logs in. Make sure modloader knows about your channels * @param login * @param data + * @param player */ - public void onClientLogin(Packet1Login login, NetworkManager data) + public void onClientLogin(Packet1Login login, NetworkManager data, EntityPlayer player) { }