diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java index bdbf2abf61c..c94a5e7e16d 100644 --- a/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java +++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCost.java @@ -468,7 +468,7 @@ public class ComputerUtilCost { continue; try { - extraManaNeeded += Integer.parseInt(snem); + extraManaNeeded += Integer.parseInt(parts[0]); } catch (final NumberFormatException e) { System.out.println("wrong SpellsNeedExtraMana SVar format on " + c); } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java index 551ff2826bb..a0c651436ab 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java @@ -125,10 +125,10 @@ public class TriggerAttacks extends Trigger { /** {@inheritDoc} */ @Override public final void setTriggeringObjects(final SpellAbility sa) { + sa.setTriggeringObject(AbilityKey.Defender, getFromRunParams(AbilityKey.Attacked)); sa.setTriggeringObjectsFrom( this, AbilityKey.Attacker, - AbilityKey.Defender, AbilityKey.Defenders, AbilityKey.DefendingPlayer );