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

Clean up some missing generic info

Browse source 
PS: NOPE: still not modding.
This commit is contained in:
Christian 2014-05-08 10:27:08 -04:00
parent b286cb6a57
commit f866aeaacb
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fml/src/main/java/cpw/mods/fml/common/network/FMLIndexedMessageToMessageCodec.java
View file

@ -73,7 +73,7 @@ public abstract class FMLIndexedMessageToMessageCodec<A> extends MessageToMessag
throw new NullPointerException("Undefined message for discriminator " + discriminator + " in channel " + msg.channel()); throw new NullPointerException("Undefined message for discriminator " + discriminator + " in channel " + msg.channel());
} }
A newMsg = clazz.newInstance(); A newMsg = clazz.newInstance();
ctx.attr(INBOUNDPACKETTRACKER).get().set(new WeakReference(msg)); ctx.attr(INBOUNDPACKETTRACKER).get().set(new WeakReference<FMLProxyPacket>(msg));
decodeInto(ctx, payload.slice(), newMsg); decodeInto(ctx, payload.slice(), newMsg);
out.add(newMsg); out.add(newMsg);
} }

3
fml/src/main/java/cpw/mods/fml/common/network/handshake/NetworkDispatcher.java
View file

@ -31,7 +31,6 @@ import net.minecraft.server.management.ServerConfigurationManager;
import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatComponentText;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec;
import cpw.mods.fml.common.network.FMLNetworkEvent; import cpw.mods.fml.common.network.FMLNetworkEvent;
import cpw.mods.fml.common.network.FMLNetworkException; import cpw.mods.fml.common.network.FMLNetworkException;
import cpw.mods.fml.common.network.FMLOutboundHandler; import cpw.mods.fml.common.network.FMLOutboundHandler;
@ -463,7 +462,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
super.exceptionCaught(ctx, cause); super.exceptionCaught(ctx, cause);
} }
// if we add any attributes, we should force removal of them here so that // if we add any attributes, we should force removal of them here so that
//they do not hold references to the world and causes it to leak. //they do not hold references to the world and causes it to leak.
private void cleanAttributes(ChannelHandlerContext ctx) private void cleanAttributes(ChannelHandlerContext ctx)
{ {