Skip to content

Fix for issue #1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
izstas wants to merge 2 commits into from
Closed

Fix for issue #1 #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92ebab7
IClientPacketHandler can now get non-null NetClientHandler before log in
izstas Aug 4, 2013
1b6028a
Moved IConnectionHandler implementation into separate class
izstas Aug 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 64 additions & 1 deletion codechicken/lib/packet/PacketCustom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import cpw.mods.fml.common.network.FMLNetworkHandler;
import cpw.mods.fml.common.network.IConnectionHandler;
import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.ITinyPacketHandler;
import cpw.mods.fml.common.network.NetworkModHandler;
Expand All @@ -28,9 +29,11 @@
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.NetLoginHandler;
import net.minecraft.network.NetServerHandler;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet1Login;
import net.minecraft.network.packet.Packet131MapData;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.server.MinecraftServer;
Expand Down Expand Up @@ -148,6 +151,7 @@ private static class ClientPacketHandler extends CustomPacketHandler
public ClientPacketHandler(String channel)
{
super(channel);
NetClientHandlerHelper.register();
}

@Override
Expand All @@ -159,7 +163,7 @@ public Side getSide()
@Override
public void handle(ICustomPacketHandler handler, PacketCustom packet, Player player)
{
((IClientPacketHandler)handler).handlePacket(packet, Minecraft.getMinecraft().getNetHandler(), Minecraft.getMinecraft());
((IClientPacketHandler)handler).handlePacket(packet, NetClientHandlerHelper.getNetHandler(), Minecraft.getMinecraft());
}
}

Expand Down Expand Up @@ -254,6 +258,65 @@ else if(handler instanceof IServerPacketHandler)
}
}

private static class NetClientHandlerHelper implements IConnectionHandler
{
NetClientHandler netClientHandler;

NetClientHandlerHelper()
{
NetworkRegistry.instance().registerConnectionHandler(this);
}

@Override
public void connectionOpened(NetHandler netHandler, String server, int port, INetworkManager manager)
{
netClientHandler = (NetClientHandler) netHandler;
}

@Override
public void connectionOpened(NetHandler netHandler, MinecraftServer server, INetworkManager manager)
{
netClientHandler = (NetClientHandler) netHandler;
}

@Override
public void connectionClosed(INetworkManager manager)
{
netClientHandler = null;
}

@Override
public String connectionReceived(NetLoginHandler netHandler, INetworkManager manager)
{
return null;
}

@Override
public void clientLoggedIn(NetHandler clientHandler, INetworkManager manager, Packet1Login login)
{
}

@Override
public void playerLoggedIn(Player player, NetHandler netHandler, INetworkManager manager)
{
}

static NetClientHandlerHelper instance;

public static void register()
{
if (instance == null)
{
instance = new NetClientHandlerHelper();
}
}

public static NetClientHandler getNetHandler()
{
return instance.netClientHandler;
}
}

public static interface IPacketCarrier
{
public int readType(Packet packet);
Expand Down