From 182876fb090c37a9749c86560611226cab2df2e0 Mon Sep 17 00:00:00 2001 From: Robert S Date: Thu, 19 Jun 2014 02:22:29 -0400 Subject: [PATCH] NPE fix for CommandMachine when dev staff is null --- src/main/scala/resonantinduction/core/CommandMachine.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/scala/resonantinduction/core/CommandMachine.java b/src/main/scala/resonantinduction/core/CommandMachine.java index e1fe6a84..e4a88405 100644 --- a/src/main/scala/resonantinduction/core/CommandMachine.java +++ b/src/main/scala/resonantinduction/core/CommandMachine.java @@ -196,7 +196,7 @@ public class CommandMachine extends CommandBase { if (event.action == Action.RIGHT_CLICK_BLOCK) { - if (event.entityPlayer.getHeldItem() != null && event.entityPlayer.getHeldItem().itemID == ResonantInduction.itemDevStaff.itemID) + if (event.entityPlayer.getHeldItem() != null && ResonantInduction.itemDevStaff != null && event.entityPlayer.getHeldItem().itemID == ResonantInduction.itemDevStaff.itemID) { if (event.entityPlayer.isSneaking()) {