cdanesi/PlayerVaults
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE in Listeners

Browse Source
This commit is contained in:
kashike
2015-06-28 18:58:41 -07:00
parent f51efcfab2
commit 8980bc5fac
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/listeners/Listeners.java
+12 -9
View File
@@ -240,17 +240,20 @@ public class Listeners implements Listener {
return; return;
} }
VaultViewInfo info = PlayerVaults.getInstance().getInVault().get(player.getUniqueId().toString()); Inventory clickedInventory = event.getClickedInventory();
if (info != null) { if (clickedInventory != null) {
int num = info.getNumber(); VaultViewInfo info = PlayerVaults.getInstance().getInVault().get(player.getUniqueId().toString());
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(num)).replace("%p", info.getHolder()); if (info != null) {
if ((event.getClickedInventory().getTitle().equalsIgnoreCase(title) || event.isShiftClick()) && event.getCurrentItem() != null) { int num = info.getNumber();
if (PlayerVaults.getInstance().isBlockedMaterial(event.getCurrentItem().getType())) { String inventoryTitle = clickedInventory.getTitle();
event.setCancelled(true); String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(num)).replace("%p", info.getHolder());
player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_ITEM.toString().replace("%m", event.getCurrentItem().getType().name())); 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()));
}
} }
} }
} }
} }
} }