From e543cbdb04867a221247ed5502391a788a74796f Mon Sep 17 00:00:00 2001 From: Sentropic Date: Sun, 30 Jun 2024 21:03:18 -0600 Subject: [PATCH] Only add material bonuses to the right material #247 --- .../modules/list/itemgenerator/ItemGeneratorManager.java | 3 ++- .../list/itemgenerator/generators/AttributeGenerator.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java b/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java index f0decb3b..47cd2f74 100644 --- a/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java +++ b/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/ItemGeneratorManager.java @@ -620,9 +620,10 @@ public BiFunction getMaterialModifiers(@NotNull ItemSta return (isBonus, result) -> result; } - public Collection getMaterialBonuses(ItemLoreStat stat) { + public Collection getMaterialBonuses(ItemStack item, ItemLoreStat stat) { List list = new ArrayList<>(); for (Map.Entry, String>> entry : this.materialBonuses.entrySet()) { + if (!ItemUtils.compareItemGroup(item, entry.getKey())) continue; for (Map.Entry, String> entry1 : entry.getValue().entrySet()) { if (entry1.getKey().equals(stat)) { String sVal = entry1.getValue(); diff --git a/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/generators/AttributeGenerator.java b/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/generators/AttributeGenerator.java index 0c86e323..de56fcd8 100644 --- a/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/generators/AttributeGenerator.java +++ b/src/main/java/studio/magemonkey/divinity/modules/list/itemgenerator/generators/AttributeGenerator.java @@ -266,7 +266,7 @@ public void generate(@NotNull ItemStack item, int itemLevel) { ((ItemLoreStat) stat).add(item, statBonus, -1); } - for (StatBonus statBonus : generatorItem.getMaterialBonuses(stat)) { + for (StatBonus statBonus : generatorItem.getMaterialBonuses(item, stat)) { ((ItemLoreStat) stat).add(item, statBonus, -1); } }