fix: Attunement Upgrades on spell blades won't cause basic attacks to…

… consume mana when a Runic Shield is held
WinDanesz · Jan 26, 2024 · 8b77003 · 8b77003
1 parent 346e018
commit 8b77003
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/com/windanesz/ancientspellcraft/item/ItemBattlemageSword.java b/src/main/java/com/windanesz/ancientspellcraft/item/ItemBattlemageSword.java
@@ -379,7 +379,7 @@ public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingB
 		}
 		cost = cost + level * 6;
 
-		if (this.getMana(stack) > 0) {
+		if (this.getMana(stack) > 0 && !(wielder.getHeldItemOffhand().getItem() instanceof ItemBattlemageShield)) {
 			// consume mana from the sword
 			this.consumeMana(stack, cost, wielder);
 		} else if (otherStack.getItem() instanceof ItemWand && !((ItemWand) otherStack.getItem()).isManaEmpty(otherStack)) {

diff --git a/src/main/resources/assets/ancientspellcraft/lang/en_us.lang b/src/main/resources/assets/ancientspellcraft/lang/en_us.lang
@@ -1512,5 +1512,5 @@ item.ancientspellcraft\:belt_soul_scorch.desc=Attackers receive the Soul Scorch
 item.ancientspellcraft\:charm_glyph_shield_disable.name=Glyph of Unyielding
 item.ancientspellcraft\:charm_glyph_shield_disable.desc=The Runic Shield cannot be disabled by axes or any other means
 item.ancientspellcraft\:runic_hammer.name=Runic Hammer
-generic.ancientspellcraft\:runic_hammer_spell.no_anvil=You must cast this spell on an Arcane Anvil
+generic.ancientspellcraft\:runic_hammer_spell.no_anvil=Battlemage tool used to cast Runesmithing spells on Arcane Anvils