From 8fb8c5fce0401de31913177a468da3c0c67f79fe Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Thu, 26 Jan 2023 18:36:01 +0100 Subject: [PATCH] Recombine trigger check --- .../main/java/forge/ai/AiAttackController.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/forge-ai/src/main/java/forge/ai/AiAttackController.java b/forge-ai/src/main/java/forge/ai/AiAttackController.java index e467b742292..e431ef91f2f 100644 --- a/forge-ai/src/main/java/forge/ai/AiAttackController.java +++ b/forge-ai/src/main/java/forge/ai/AiAttackController.java @@ -1439,7 +1439,21 @@ public class AiAttackController { } SpellAbility sa = st.getPayingTrigSA(); if (sa == null) { - continue; + // not the delayed variant + for (Trigger t : c.getTriggers()) { + if (!TriggerType.Exerted.equals(t.getMode())) { + continue; + } + sa = t.ensureAbility(); + if (c.getController().isAI()) { + PlayerControllerAi aic = ((PlayerControllerAi) c.getController().getController()); + if (!aic.getAi().doTrigger(sa, false)) { + missTarget = true; + break; + } + } + } + break; } if (sa.usesTargeting()) { sa.setActivatingPlayer(c.getController(), true);