You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
19 lines
836 B
19 lines
836 B
10 years ago
|
--- ../src-base/minecraft/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java
|
||
|
|
+++ ../src-work/minecraft/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java
|
||
|
|
@@ -13,9 +13,15 @@
|
||
|
|
@Override
|
||
|
|
protected void channelRead0(ChannelHandlerContext ctx, CompleteHandshake msg) throws Exception
|
||
|
|
{
|
||
|
|
+ // Cauldron start - attempt to fix race condition with attr being null
|
||
|
|
+ Object attr = ctx.channel().attr(NetworkDispatcher.FML_DISPATCHER);
|
||
|
|
+ if (attr != null)
|
||
|
|
+ {
|
||
|
|
NetworkDispatcher dispatcher = ctx.channel().attr(NetworkDispatcher.FML_DISPATCHER).getAndRemove();
|
||
|
|
dispatcher.completeHandshake(msg.target);
|
||
|
|
}
|
||
|
|
+ // Cauldron end
|
||
|
|
+ }
|
||
|
|
|
||
|
|
@Override
|
||
|
|
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception
|