From 94c049f77c8c9cf4c24ea607464d9b79c16add19 Mon Sep 17 00:00:00 2001 From: drtshock Date: Wed, 24 Jun 2015 14:32:07 -0500 Subject: [PATCH] Revert "Attempt to fix #73. Not confirmed as a fix." This reverts commit c2fa317e169ca4221b3646e952d1c2112d0b78da. --- .../java/com/drtshock/playervaults/listeners/Listeners.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java index 777c6c3..dfa85f1 100644 --- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java +++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java @@ -256,8 +256,8 @@ public class Listeners implements Listener { if (info != null) { int num = info.getNumber(); String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(num)).replace("%p", info.getHolder()); - if ((event.getClickedInventory().getTitle() != null && event.getClickedInventory().getTitle().equalsIgnoreCase(title) || event.isShiftClick()) && event.getCurrentItem() != null) { - if (PlayerVaults.getInstance().isBlockedMaterial(event.getCurrentItem().getType())) { + if ((event.getClickedInventory().getTitle().equalsIgnoreCase(title) || event.isShiftClick()) && event.getCurrentItem() != null) { + if (event.getCurrentItem() != null && PlayerVaults.getInstance().isBlockedMaterial(event.getCurrentItem().getType())) { event.setCancelled(true); player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_ITEM.toString().replace("%m", event.getCurrentItem().getType().name())); }