keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Add the player object to the onLogin event so you don't need to dive internals for it during login

This commit is contained in:
Christian Weeks 2012-04-07 22:38:29 -04:00
parent 331768b272
commit 42aee9032f
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fml/patches/minecraft_server/net/minecraft/src/NetLoginHandler.java.patch
View File

@ -14,7 +14,7 @@
var2.func_20057_k(); 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; this.field_7_c = true;

4
fml/server/cpw/mods/fml/server/FMLServerHandler.java
View File

@ -393,13 +393,13 @@ public class FMLServerHandler implements IFMLSidedHandler
* @param loginPacket * @param loginPacket
* @param networkManager * @param networkManager
*/ */
public void handleLogin(Packet1Login loginPacket, NetworkManager networkManager) public void handleLogin(Packet1Login loginPacket, NetworkManager networkManager, EntityPlayer player)
{ {
for (ModContainer mod : Loader.getModList()) for (ModContainer mod : Loader.getModList())
{ {
if (mod.wantsNetworkPackets()) if (mod.wantsNetworkPackets())
{ {
mod.getNetworkHandler().onLogin(loginPacket, networkManager); mod.getNetworkHandler().onLogin(loginPacket, networkManager, player);
} }
} }

5
fml/server/net/minecraft/src/BaseMod.java
View File

@ -49,7 +49,7 @@ public abstract class BaseMod implements IWorldGenerator, IPickupNotifier, IDisp
@Override @Override
public final void onLogin(Object... data) public final void onLogin(Object... data)
{ {
onClientLogin((Packet1Login)data[0], (NetworkManager)data[1]); onClientLogin((Packet1Login)data[0], (NetworkManager)data[1], (EntityPlayer) data[2]);
} }
@Override @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 * Called when a new client logs in. Make sure modloader knows about your channels
* @param login * @param login
* @param data * @param data
* @param player
*/ */
public void onClientLogin(Packet1Login login, NetworkManager data) public void onClientLogin(Packet1Login login, NetworkManager data, EntityPlayer player)
{ {
} }