oop

klashdevelopment · Jun 24, 2024 · b68b082 · b68b082
1 parent 2f2ecd0
commit b68b082
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/main/java/dev/klash/caramel/CaramelListening.java b/src/main/java/dev/klash/caramel/CaramelListening.java
@@ -28,16 +28,17 @@ public void onItemClick(PlayerInteractEvent event) {
                 }
             }
         }
-        if(event.getItem().getItemMeta().getPersistentDataContainer().has(Caramel.getInstance().isCaramelKey, PersistentDataType.BOOLEAN)) {
+        if (event.getItem() == null || event.getItem().getItemMeta() == null) return;
+//        if(event.getItem().getItemMeta().getPersistentDataContainer().has(Caramel.getInstance().isCaramelKey, PersistentDataType.BOOLEAN)) {
             for (CaramelItem item : Caramel.getInstance().items.getItemList()) {
-                if (event.getItem() == null || event.getItem().getItemMeta() == null) continue;
-                String itemID = item.getDetails().id();
-                String heldItemID = event.getItem().getItemMeta().getPersistentDataContainer().get(Caramel.getInstance().caramelIDKey, PersistentDataType.STRING);
-                if (event.getItem() != null && heldItemID.equalsIgnoreCase(itemID)) {
+//                String itemID = item.getDetails().id();
+//                String heldItemID = event.getItem().getItemMeta().getPersistentDataContainer().get(Caramel.getInstance().caramelIDKey, PersistentDataType.STRING);
+//                if (heldItemID.equalsIgnoreCase(itemID)) {
+                if(CaramelFactory.build(item).isSimilar(event.getItem())) {
                     item.onItemUse(event.getAction().isLeftClick() ? ClickType.LEFT_CLICK : ClickType.RIGHT_CLICK, event.getItem(), event);
                     if (item.cancelEvent()) event.setCancelled(true);
                 }
             }
-        }
+//        }
     }
 }