From 8980bc5facde9ad1fd0e205b067153daa623f326 Mon Sep 17 00:00:00 2001 From: kashike Date: Sun, 28 Jun 2015 18:58:41 -0700 Subject: [PATCH] Fix NPE in Listeners --- .../playervaults/listeners/Listeners.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java index 06dc288..0b68984 100644 --- a/src/main/java/com/drtshock/playervaults/listeners/Listeners.java +++ b/src/main/java/com/drtshock/playervaults/listeners/Listeners.java @@ -240,17 +240,20 @@ public class Listeners implements Listener { return; } - VaultViewInfo info = PlayerVaults.getInstance().getInVault().get(player.getUniqueId().toString()); - 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().equalsIgnoreCase(title) || event.isShiftClick()) && event.getCurrentItem() != null) { - if (PlayerVaults.getInstance().isBlockedMaterial(event.getCurrentItem().getType())) { - event.setCancelled(true); - player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_ITEM.toString().replace("%m", event.getCurrentItem().getType().name())); + Inventory clickedInventory = event.getClickedInventory(); + if (clickedInventory != null) { + VaultViewInfo info = PlayerVaults.getInstance().getInVault().get(player.getUniqueId().toString()); + if (info != null) { + int num = info.getNumber(); + String inventoryTitle = clickedInventory.getTitle(); + String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(num)).replace("%p", info.getHolder()); + if (((inventoryTitle != null && inventoryTitle.equalsIgnoreCase(title)) || event.isShiftClick()) && event.getCurrentItem() != null) { + if (PlayerVaults.getInstance().isBlockedMaterial(event.getCurrentItem().getType())) { + event.setCancelled(true); + player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_ITEM.toString().replace("%m", event.getCurrentItem().getType().name())); + } } } } - } }