From 4682cfec08d2e3f377ac50a37f1269bfc8e29645 Mon Sep 17 00:00:00 2001 From: rockyhawk64 Date: Thu, 7 Jan 2021 09:50:21 +1100 Subject: [PATCH] v3.14.5.3 --- resource/plugin.yml | 2 +- .../commandpanels/classresources/CommandTags.java | 4 ++-- .../classresources/ItemCreation.java | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/resource/plugin.yml b/resource/plugin.yml index 9147b66..a906861 100644 --- a/resource/plugin.yml +++ b/resource/plugin.yml @@ -1,4 +1,4 @@ -version: 3.14.5.2 +version: 3.14.5.3 main: me.rockyhawk.commandpanels.CommandPanels name: CommandPanels author: RockyHawk diff --git a/src/me/rockyhawk/commandpanels/classresources/CommandTags.java b/src/me/rockyhawk/commandpanels/classresources/CommandTags.java index 702f0b0..3518fcf 100644 --- a/src/me/rockyhawk/commandpanels/classresources/CommandTags.java +++ b/src/me/rockyhawk/commandpanels/classresources/CommandTags.java @@ -644,7 +644,7 @@ public class CommandTags { if(command.split("\\s").length == 2){ //if item paywall is custom item - if(content.isSimilar(sellItem)){ + if(plugin.itemCreate.isIdentical(sellItem,content)){ content.setAmount(content.getAmount() - sellItem.getAmount()); p.updateInventory(); removedItem = 1; @@ -653,7 +653,7 @@ public class CommandTags { //if custom item is an mmo item (1.14+ for the API) try { - if (plugin.getServer().getPluginManager().isPluginEnabled("MMOItems")) { + if (plugin.getServer().getPluginManager().isPluginEnabled("MMOItems") && plugin.openPanels.getOpenPanel(p.getName()).getString("custom-item." + command.split("\\s")[1] + ".material").startsWith("mmo=")) { String customItemMaterial = plugin.openPanels.getOpenPanel(p.getName()).getString("custom-item." + command.split("\\s")[1] + ".material"); String mmoType = customItemMaterial.split("\\s")[1]; String mmoID = customItemMaterial.split("\\s")[2]; diff --git a/src/me/rockyhawk/commandpanels/classresources/ItemCreation.java b/src/me/rockyhawk/commandpanels/classresources/ItemCreation.java index 4638b38..28711ca 100644 --- a/src/me/rockyhawk/commandpanels/classresources/ItemCreation.java +++ b/src/me/rockyhawk/commandpanels/classresources/ItemCreation.java @@ -517,6 +517,7 @@ public class ItemCreation { The isIdentical() function will check for the following Material, Name, Lore, Enchanted */ + @SuppressWarnings("deprecation") public boolean isIdentical(ItemStack one, ItemStack two){ //check material if(one.getType() != two.getType()){ @@ -538,6 +539,20 @@ public class ItemCreation { } } }catch(Exception ignore){} + //check for damage + try { + if(plugin.legacy.isLegacy()){ + if(one.getDurability() != two.getDurability()) { + return false; + } + }else { + Damageable tempOne = (Damageable) one.getItemMeta(); + Damageable tempTwo = (Damageable) two.getItemMeta(); + if(tempOne.getDamage() != tempTwo.getDamage()){ + return false; + } + } + } catch (Exception ignore) {} //check for enchantments if(one.getEnchantments().equals(two.getEnchantments())){ if(!one.getEnchantments().isEmpty()) {