Merge pull request #29 from liquip/fix/item-impl

Fix features and enchantments not being initialized
liquip · Dec 31, 2022 · 4cbf406 · 4cbf406
2 parents 229d107 + 04e9601
commit 4cbf406
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 allprojects {
     group = "io.github.liquip"
-    version = "2.0.0-beta"
+    version = "2.0.1-beta"
 
     repositories {
         mavenCentral()

diff --git a/paper-core/src/main/java/io/github/liquip/paper/core/item/ItemImpl.java b/paper-core/src/main/java/io/github/liquip/paper/core/item/ItemImpl.java
@@ -31,10 +31,10 @@ public class ItemImpl implements Item {
     private final Material material;
     private final Component displayName;
     private final List<Component> lore;
+    private final Multimap<Class<? extends Event>, BiConsumer<? extends Event, ItemStack>> eventHandlers;
     private final Object2IntMap<Enchantment> enchantments;
     private final List<Feature> features;
     private final Map<TaggedFeature<?>, Object> taggedFeatures;
-    private final Multimap<Class<? extends Event>, BiConsumer<? extends Event, ItemStack>> eventHandlers;
 
     public ItemImpl(@NonNull Liquip api, @NonNull Key key, @NonNull Material material, @NonNull Component displayName,
         @NonNull List<Component> lore, @NonNull Object2IntMap<Enchantment> enchantments, @NonNull List<Feature> features,
@@ -46,10 +46,18 @@ public ItemImpl(@NonNull Liquip api, @NonNull Key key, @NonNull Material materia
         this.displayName = displayName;
         this.lore = new ArrayList<>(lore.size());
         this.lore.addAll(lore);
+        this.eventHandlers = ArrayListMultimap.create();
+        this.eventHandlers.putAll(eventHandlers);
         this.enchantments = new Object2IntOpenHashMap<>(enchantments.size());
-        this.enchantments.putAll(enchantments);
+        for (final Object2IntMap.Entry<Enchantment> entry : enchantments.object2IntEntrySet()) {
+            this.enchantments.put(entry.getKey(), entry.getIntValue());
+            entry.getKey().initialize(this, entry.getIntValue());
+        }
         this.features = new ArrayList<>(features.size());
-        this.features.addAll(features);
+        for (final Feature feature : features) {
+            this.features.add(feature);
+            feature.initialize(this);
+        }
         this.taggedFeatures = new LinkedHashMap<>(taggedFeatures.size());
         for (final Map.Entry<TaggedFeature<?>, ConfigElement> entry : taggedFeatures.entrySet()) {
             final Object res = entry.getKey().initialize(this, entry.getValue());
@@ -60,8 +68,6 @@ public ItemImpl(@NonNull Liquip api, @NonNull Key key, @NonNull Material materia
             }
             this.taggedFeatures.put(entry.getKey(), res);
         }
-        this.eventHandlers = ArrayListMultimap.create();
-        this.eventHandlers.putAll(eventHandlers);
     }
 
     @SuppressWarnings("unchecked")