Item name replaces item info if available; remove legacy custom item …

…guard
StarTux · Mar 21, 2017 · d4958cf · d4958cf
1 parent 6890728
commit d4958cf
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/main/java/edu/self/startux/craftBay/RealItem.java b/src/main/java/edu/self/startux/craftBay/RealItem.java
@@ -64,14 +64,6 @@ public RealItem(ItemStack stack, int amount) {
         this.amount = amount;
         if (stack.getType() == Material.AIR) throw new IllegalArgumentException();
         ItemMeta meta = stack.getItemMeta();
-        if (meta.hasLore()) {
-            List<String> lore = meta.getLore();
-            if (!lore.isEmpty()) {
-                if (lore.get(0).contains("" + ChatColor.RESET + ChatColor.BLACK + ChatColor.MAGIC)) {
-                    throw new IllegalArgumentException();
-                }
-            }
-        }
         if (stack.getType() == Material.SKULL_ITEM && (int)stack.getDurability() == 3) {
             SkullMeta skull = (SkullMeta)meta;
             if (!skull.hasOwner() || skull.getOwner() == null) {
@@ -202,7 +194,6 @@ public String getDescription() {
             case 99: sb.append(" (Iron Golem)"); break;
             }
         }
-
         return sb.toString();
     }
 
@@ -213,6 +204,10 @@ public ItemAmount getAmount() {
 
     @Override
     public String getItemInfo() {
+        if (CraftBayPlugin.getInstance().getGenericEventsHandler() != null) {
+            String result = CraftBayPlugin.getInstance().getGenericEventsHandler().getItemName(stack);
+            if (result != null) return result;
+        }
         StringBuffer result = new StringBuffer();
         if (canBeDamaged() && stack.getDurability() > 0) {
             int durability = stack.getType().getMaxDurability() - stack.getDurability();