From f0f6592a383495bb4e0b9f67723dc28790714031 Mon Sep 17 00:00:00 2001
From: TRT <>
Date: Mon, 25 Oct 2021 13:56:35 +0200
Subject: [PATCH] Fix predictToughnessBonusOfAttacker logic

---
 forge-ai/src/main/java/forge/ai/AiAttackController.java | 2 +-
 forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java
index 23f5b9e7b31..94e600d655e 100644
--- a/forge-ai/src/main/java/forge/ai/AiAttackController.java
+++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java
@@ -208,7 +208,7 @@ public class AiAttackController {
      */
     public final boolean isEffectiveAttacker(final Player ai, final Card attacker, final Combat combat, final GameEntity defender) {
         // if the attacker will die when attacking don't attack
-        if ((attacker.getNetToughness() + ComputerUtilCombat.predictToughnessBonusOfAttacker(attacker, null, combat, true)) <= 0) {
+        if (attacker.getNetToughness() + ComputerUtilCombat.predictToughnessBonusOfAttacker(attacker, null, combat, true) <= 0) {
             return false;
         }
 
diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
index a841b338cd3..ab6f76c8477 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCombat.java
@@ -1478,7 +1478,7 @@ public class ComputerUtilCombat {
 
             // DealDamage triggers
             if (ApiType.DealDamage.equals(sa.getApi())) {
-                if ("TriggeredAttacker".equals(sa.getParam("Defined"))) {
+                if (!sa.hasParam("Defined") || !sa.getParam("Defined").startsWith("TriggeredAttacker")) {
                     continue;
                 }
                 int damage = AbilityUtils.calculateAmount(source, sa.getParam("NumDmg"), sa);