Check against air, not null

EngineHub · May 7, 2019 · 38acda8 · 38acda8
1 parent a35b840
commit 38acda8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/sk89q/craftbook/mechanics/area/simple/Bridge.java b/src/main/java/com/sk89q/craftbook/mechanics/area/simple/Bridge.java
@@ -115,7 +115,7 @@ public void onRightClick(SignClickEvent event) {
             ChangedSign sign = event.getSign();
 
             if (CraftBookPlugin.inst().getConfiguration().safeDestruction && sign != null && !sign.getLine(0).equalsIgnoreCase("infinite"))
-                if (event.getPlayer().getItemInHand() != null) {
+                if (event.getPlayer().getItemInHand().getType() != Material.AIR) {
                     BlockData bridgeType = getBlockType(event.getClickedBlock());
                     if (bridgeType.getMaterial() == event.getPlayer().getItemInHand().getType()) {
 

diff --git a/src/main/java/com/sk89q/craftbook/mechanics/area/simple/Door.java b/src/main/java/com/sk89q/craftbook/mechanics/area/simple/Door.java
@@ -116,7 +116,7 @@ public void onRightClick(SignClickEvent event) {
             ChangedSign sign = event.getSign();
 
             if (CraftBookPlugin.inst().getConfiguration().safeDestruction && sign != null && !sign.getLine(0).equalsIgnoreCase("infinite"))
-                if (event.getPlayer().getItemInHand() != null)
+                if (event.getPlayer().getItemInHand().getType() != Material.AIR)
                     if (getBlockBase(event.getClickedBlock()).getType() == event.getPlayer().getItemInHand().getType() && getBlockBase(event.getClickedBlock()).getData() == event.getPlayer().getItemInHand().getData().getData()) {
 
                         if (!player.hasPermission("craftbook.mech.door.restock")) {