From bb7b40c8bb683d0b461c999172070b8d546af5e9 Mon Sep 17 00:00:00 2001 From: pahimar Date: Mon, 6 Apr 2015 08:20:28 -0400 Subject: [PATCH] Should fix #790 I think --- .../com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java index f394f802..f840d088 100644 --- a/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java +++ b/src/main/java/com/pahimar/ee3/client/handler/ItemTooltipEventHandler.java @@ -33,7 +33,7 @@ public class ItemTooltipEventHandler @SubscribeEvent public void handleItemTooltipEvent(ItemTooltipEvent event) { - if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || event.entityPlayer.openContainer instanceof ContainerAlchemicalTome) + if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT) || (event.entityPlayer != null && event.entityPlayer.openContainer instanceof ContainerAlchemicalTome)) { WrappedStack stack = new WrappedStack(event.itemStack);