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

Improved item handling

Browse Source
This commit is contained in:
CmdrKittens
2020-06-04 20:36:01 -04:00
parent 659273cede
commit 4a2f70bf1b
2 changed files with 37 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/drtshock/playervaults/Metrics.java
+15 -14
View File
@@ -135,21 +135,22 @@ public class Metrics {
logSentData = config.getBoolean("logSentData", false); logSentData = config.getBoolean("logSentData", false);
logResponseStatusText = config.getBoolean("logResponseStatusText", false); logResponseStatusText = config.getBoolean("logResponseStatusText", false);
boolean found = false; if (enabled) {
// Search for all other bStats Metrics classes to see if we are the first one boolean found = false;
for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) { // Search for all other bStats Metrics classes to see if we are the first one
try { for (Class<?> service : Bukkit.getServicesManager().getKnownServices()) {
service.getField("B_STATS_VERSION"); // Our identifier :) try {
found = true; // We aren't the first service.getField("B_STATS_VERSION"); // Our identifier :)
break; found = true; // We aren't the first
} catch (NoSuchFieldException ignored) { break;
} catch (NoSuchFieldException ignored) { }
}
// Register our service
Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal);
if (!found) {
// We are the first!
startSubmitting();
} }
}
// Register our service
Bukkit.getServicesManager().register(Metrics.class, this, plugin, ServicePriority.Normal);
if (!found) {
// We are the first!
startSubmitting();
} }
} }
src/main/java/com/drtshock/playervaults/listeners/Listeners.java
+22 -9
View File
@@ -115,16 +115,29 @@ 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)) {
try { ItemStack[] items = new ItemStack[2];
event.getCurrentItem().toString(); items[0] = event.getCurrentItem();
} catch (Exception e) { if (event.getHotbarButton() > -1 && event.getWhoClicked().getInventory().getItem(event.getHotbarButton()) != null) {
player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_BAD_ITEM); items[1] = event.getWhoClicked().getInventory().getItem(event.getHotbarButton());
event.setCancelled(true);
} }
if (!player.hasPermission("playervaults.bypassblockeditems") && PlayerVaults.getInstance().isBlockedMaterial(event.getCurrentItem().getType())) {
event.setCancelled(true); for (ItemStack item : items) {
player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_ITEM.toString().replace("%m", event.getCurrentItem().getType().name())); if (item == null) {
continue;
}
try {
item.toString();
} catch (Exception e) {
player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_BAD_ITEM);
event.setCancelled(true);
return;
}
if (!player.hasPermission("playervaults.bypassblockeditems") && PlayerVaults.getInstance().isBlockedMaterial(item.getType())) {
event.setCancelled(true);
player.sendMessage(Lang.TITLE.toString() + Lang.BLOCKED_ITEM.toString().replace("%m", item.getType().name()));
return;
}
} }
} }
} }