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

Split the packet salutation in two so we can work with or without forge

This commit is contained in:
Christian Weeks 2012-04-08 00:18:37 -04:00
parent 42aee9032f
commit 83730ee9ec
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;

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

@ -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?
*/

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

@ -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)
{
}