From 752be6b526e162665ac16e20c161b38de4e745ea Mon Sep 17 00:00:00 2001 From: mezz Date: Sun, 11 Mar 2018 14:58:58 -0700 Subject: [PATCH] Fix #4792 TextComponentHelper handling for FakePlayers --- .../server/command/TextComponentHelper.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/server/command/TextComponentHelper.java b/src/main/java/net/minecraftforge/server/command/TextComponentHelper.java index 8e86b8b790..35783d6ba3 100644 --- a/src/main/java/net/minecraftforge/server/command/TextComponentHelper.java +++ b/src/main/java/net/minecraftforge/server/command/TextComponentHelper.java @@ -21,6 +21,8 @@ package net.minecraftforge.server.command; import io.netty.channel.Channel; import net.minecraft.command.ICommandSender; import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.NetHandlerPlayServer; +import net.minecraft.network.NetworkManager; import net.minecraft.util.text.TextComponentBase; import net.minecraft.util.text.TextComponentString; import net.minecraft.util.text.TextComponentTranslation; @@ -49,8 +51,13 @@ public class TextComponentHelper if (sender instanceof EntityPlayerMP) { EntityPlayerMP playerMP = (EntityPlayerMP) sender; - Channel channel = playerMP.connection.netManager.channel(); - return !channel.attr(NetworkRegistry.FML_MARKER).get(); + NetHandlerPlayServer connection = playerMP.connection; + if (connection != null) + { + NetworkManager netManager = connection.netManager; + Channel channel = netManager.channel(); + return !channel.attr(NetworkRegistry.FML_MARKER).get(); + } } return false; }