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

Amend previous commit

Browse Source
This commit is contained in:
CmdrKittens
2020-03-28 22:52:32 -04:00
parent 1547e58b9b
commit a2980ca603
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/listeners/Listeners.java
+10 -6
View File
@@ -115,14 +115,14 @@ public class Listeners implements Listener {
int num = info.getNumber(); int num = info.getNumber();
String inventoryTitle = event.getView().getTitle(); String inventoryTitle = event.getView().getTitle();
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(num)).replace("%p", info.getVaultName()); String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(num)).replace("%p", info.getVaultName());
if (((inventoryTitle.equalsIgnoreCase(title)) || event.getCurrentItem() != null)) { if (((inventoryTitle.equalsIgnoreCase(title)) && event.getCurrentItem() != null)) {
try { try {
event.getCurrentItem().toString(); event.getCurrentItem().toString();
} catch (Exception e) { } catch (Exception e) {
player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_BAD_ITEM); player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_BAD_ITEM);
event.setCancelled(true); event.setCancelled(true);
} }
if (!player.hasPermission("playervaults.bypassblockeditems") && event.getCurrentItem() != null && PlayerVaults.getInstance().isBlockedMaterial(event.getCurrentItem().getType())) { if (!player.hasPermission("playervaults.bypassblockeditems") && PlayerVaults.getInstance().isBlockedMaterial(event.getCurrentItem().getType())) {
event.setCancelled(true); event.setCancelled(true);
player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_ITEM.toString().replace("%m", event.getCurrentItem().getType().name())); player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_ITEM.toString().replace("%m", event.getCurrentItem().getType().name()));
} }
@@ -138,9 +138,6 @@ public class Listeners implements Listener {
} }
Player player = (Player) event.getWhoClicked(); Player player = (Player) event.getWhoClicked();
if (player.hasPermission("playervaults.bypassblockeditems")) {
return;
}
Inventory clickedInventory = event.getInventory(); Inventory clickedInventory = event.getInventory();
if (clickedInventory != null) { if (clickedInventory != null) {
@@ -151,7 +148,14 @@ public class Listeners implements Listener {
String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(num)).replace("%p", info.getVaultName()); String title = Lang.VAULT_TITLE.toString().replace("%number", String.valueOf(num)).replace("%p", info.getVaultName());
if ((inventoryTitle != null && inventoryTitle.equalsIgnoreCase(title)) && event.getNewItems() != null) { if ((inventoryTitle != null && inventoryTitle.equalsIgnoreCase(title)) && event.getNewItems() != null) {
for (ItemStack item : event.getNewItems().values()) { for (ItemStack item : event.getNewItems().values()) {
if (PlayerVaults.getInstance().isBlockedMaterial(item.getType())) { try {
item.toString();
} catch (Exception e) {
player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_BAD_ITEM);
event.setCancelled(true);
continue;
}
if (!player.hasPermission("playervaults.bypassblockeditems") && PlayerVaults.getInstance().isBlockedMaterial(item.getType())) {
event.setCancelled(true); event.setCancelled(true);
player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_ITEM.toString().replace("%m", item.getType().name())); player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_ITEM.toString().replace("%m", item.getType().name()));
return; return;