From 77c5caffd5a04d073c886c5b32365e027cb821dc Mon Sep 17 00:00:00 2001 From: Lex Manos Date: Sat, 16 Nov 2013 15:26:00 -0800 Subject: [PATCH] Fix NPE on specific tile entities when the block break event is canceled. Closes #863 --- common/net/minecraftforge/common/ForgeHooks.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/common/net/minecraftforge/common/ForgeHooks.java b/common/net/minecraftforge/common/ForgeHooks.java index 43dbe83474..8d98241644 100644 --- a/common/net/minecraftforge/common/ForgeHooks.java +++ b/common/net/minecraftforge/common/ForgeHooks.java @@ -22,6 +22,7 @@ import net.minecraft.item.ItemSpade; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; import net.minecraft.network.NetServerHandler; +import net.minecraft.network.packet.Packet; import net.minecraft.network.packet.Packet53BlockChange; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.AxisAlignedBB; @@ -487,7 +488,11 @@ public class ForgeHooks TileEntity tileentity = world.getBlockTileEntity(x, y, z); if (tileentity != null) { - entityPlayer.playerNetServerHandler.sendPacketToPlayer(tileentity.getDescriptionPacket()); + Packet pkt = tileentity.getDescriptionPacket(); + if (pkt != null) + { + entityPlayer.playerNetServerHandler.sendPacketToPlayer(pkt); + } } } return event;