fix: Fixed Words of Unbinding randomly choosing the upgrade to remove…

… while holding a off-hand upgrade scroll. This only affected wand upgrade scrolls added by Ancient Spellcraft. Fixes #202
WinDanesz · Jun 7, 2024 · d07ed57 · d07ed57
1 parent 472e1f4
commit d07ed57
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 24 deletions.
diff --git a/src/main/java/com/windanesz/ancientspellcraft/item/ItemSentienceTomeUpgrade.java b/src/main/java/com/windanesz/ancientspellcraft/item/ItemSentienceTomeUpgrade.java
diff --git a/src/main/java/com/windanesz/ancientspellcraft/spell/WordsOfUnbinding.java b/src/main/java/com/windanesz/ancientspellcraft/spell/WordsOfUnbinding.java
@@ -118,6 +118,11 @@ public static boolean removeUpgrade(EntityPlayer player, ItemStack wand, @Nullab
 
 			String upgradeString = upgrade.getRegistryName().getPath().replace("_upgrade", "");
 
+			// AS upgrades have a _suffix, but I won't fix this now as it would break existing worlds, this is a bit ugly but won't cause a breaking change
+			if (upgrade.getRegistryName().getNamespace().toString().equals(AncientSpellcraft.MODID)) {
+				upgradeString += "_upgrade";
+			}
+
 			if (upgrades.hasKey(upgradeString)) {
 				int counter = upgrades.getInteger(upgradeString);
 				counter--;
@@ -174,7 +179,7 @@ private static void removeRandomUpgrade(EntityPlayer player, ItemStack wand, boo
 					upgrades.removeTag(upgradeToDecrease);
 				}
 
-				if (upgradeToDecrease.equals("attunement")) {
+				 if (upgradeToDecrease.equals("attunement")) {
 					if (wand.getItem() instanceof IWorkbenchItem) {
 						Spell[] spells = WandHelper.getSpells(wand);
 						Spell[] newSpells = new Spell[((IWorkbenchItem) wand.getItem()).getSpellSlotCount(wand)];