Only add material bonuses to the right material #247

magemonkeystudio · Jul 1, 2024 · e543cbd · e543cbd
1 parent df02d62
commit e543cbd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java b/...main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java
@@ -620,9 +620,10 @@ public BiFunction<Boolean, Double, Double> getMaterialModifiers(@NotNull ItemSta
             return (isBonus, result) -> result;
         }
 
-        public Collection<StatBonus> getMaterialBonuses(ItemLoreStat<?> stat) {
+        public Collection<StatBonus> getMaterialBonuses(ItemStack item, ItemLoreStat<?> stat) {
             List<StatBonus> list = new ArrayList<>();
             for (Map.Entry<String, Map<ItemLoreStat<?>, String>> entry : this.materialBonuses.entrySet()) {
+                if (!ItemUtils.compareItemGroup(item, entry.getKey())) continue;
                 for (Map.Entry<ItemLoreStat<?>, String> entry1 : entry.getValue().entrySet()) {
                     if (entry1.getKey().equals(stat)) {
                         String   sVal  = entry1.getValue();

diff --git a/.../studio/magemonkey/divinity/modules/list/itemgenerator/generators/AttributeGenerator.java b/.../studio/magemonkey/divinity/modules/list/itemgenerator/generators/AttributeGenerator.java
@@ -266,7 +266,7 @@ public void generate(@NotNull ItemStack item, int itemLevel) {
                         ((ItemLoreStat<StatBonus>) stat).add(item, statBonus, -1);
                     }
 
-                    for (StatBonus statBonus : generatorItem.getMaterialBonuses(stat)) {
+                    for (StatBonus statBonus : generatorItem.getMaterialBonuses(item, stat)) {
                         ((ItemLoreStat<StatBonus>) stat).add(item, statBonus, -1);
                     }
                 }