From 8a69b17bd672591899414dcb416d2968188e6800 Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 13 May 2014 08:13:55 -0400 Subject: [PATCH] Don't consider null NetworkDispatchers. This should fix a bunch of fakeplayer issues. Nothing to see here. No modding being done. --- .../cpw/mods/fml/common/network/FMLOutboundHandler.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fml/src/main/java/cpw/mods/fml/common/network/FMLOutboundHandler.java b/fml/src/main/java/cpw/mods/fml/common/network/FMLOutboundHandler.java index 9166eb5038..21f01ed89f 100644 --- a/fml/src/main/java/cpw/mods/fml/common/network/FMLOutboundHandler.java +++ b/fml/src/main/java/cpw/mods/fml/common/network/FMLOutboundHandler.java @@ -129,7 +129,7 @@ public class FMLOutboundHandler extends ChannelOutboundHandlerAdapter { for (EntityPlayerMP player : (List)FMLCommonHandler.instance().getMinecraftServerInstance().getConfigurationManager().playerEntityList) { NetworkDispatcher dispatcher = player.playerNetServerHandler.netManager.channel().attr(NetworkDispatcher.FML_DISPATCHER).get(); - builder.add(dispatcher); + if (dispatcher != null) builder.add(dispatcher); } return builder.build(); } @@ -160,7 +160,8 @@ public class FMLOutboundHandler extends ChannelOutboundHandlerAdapter { if (dimension == player.dimension) { NetworkDispatcher dispatcher = player.playerNetServerHandler.netManager.channel().attr(NetworkDispatcher.FML_DISPATCHER).get(); - builder.add(dispatcher); + // Null dispatchers may exist for fake players - skip them + if (dispatcher != null) builder.add(dispatcher); } } return builder.build(); @@ -200,7 +201,7 @@ public class FMLOutboundHandler extends ChannelOutboundHandlerAdapter { if (d4 * d4 + d5 * d5 + d6 * d6 < tp.range * tp.range) { NetworkDispatcher dispatcher = player.playerNetServerHandler.netManager.channel().attr(NetworkDispatcher.FML_DISPATCHER).get(); - builder.add(dispatcher); + if (dispatcher != null) builder.add(dispatcher); } } }