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
920 B
19 lines
920 B
--- ../src-base/minecraft/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java |
|
+++ ../src-work/minecraft/cpw/mods/fml/common/network/internal/HandshakeCompletionHandler.java |
|
@@ -13,8 +13,14 @@ |
|
@Override |
|
protected void channelRead0(ChannelHandlerContext ctx, CompleteHandshake msg) throws Exception |
|
{ |
|
- NetworkDispatcher dispatcher = ctx.channel().attr(NetworkDispatcher.FML_DISPATCHER).getAndRemove(); |
|
- dispatcher.completeHandshake(msg.target); |
|
+ // Cauldron start - attempt to fix race condition with attr being null |
|
+ io.netty.util.Attribute<NetworkDispatcher> attr = ctx.channel().attr(NetworkDispatcher.FML_DISPATCHER); |
|
+ if (attr != null) |
|
+ { |
|
+ NetworkDispatcher dispatcher = attr.getAndRemove(); |
|
+ if (dispatcher != null) dispatcher.completeHandshake(msg.target); |
|
+ } |
|
+ // Cauldron end |
|
} |
|
|
|
@Override
|
|
|