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

Clone FML packet indexes if channel is not open. Fixes potential threading issue.

Browse source
This commit is contained in:
LexManos 2016-01-14 13:35:19 -08:00
parent dad870ea0b
commit 7b92a27908
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
View file

@ -238,7 +238,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
manager.closeChannel(new ChatComponentText("Handshake Complete review log file for details."));
scm.initializeConnectionToPlayer(manager, player, serverHandler);
}
@Override
protected void channelRead0(ChannelHandlerContext ctx, Packet msg) throws Exception
{
@ -430,6 +430,8 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
public void sendProxy(FMLProxyPacket msg)
{
if (!manager.isChannelOpen())
msg = msg.copy();
manager.sendPacket(msg);
}

9
src/main/java/net/minecraftforge/fml/common/network/internal/FMLProxyPacket.java
View file

@ -186,4 +186,13 @@ public class FMLProxyPacket implements Packet<INetHandler> {
{
return target;
}
public FMLProxyPacket copy()
{
FMLProxyPacket pkt = new FMLProxyPacket(new PacketBuffer(payload.duplicate()), channel);
pkt.dispatcher = dispatcher;
pkt.netHandler = netHandler;
pkt.target = target;
return pkt;
}
}