- Fixed possible NPE in combatTriggerWillTrigger.

2025-11-17 03:08:02 +00:00 · 2013-06-26 13:44:11 +00:00
parent 6e111aab3a
commit f280ba4e05
1 changed files with 3 additions and 0 deletions
--- a/src/main/java/forge/game/ai/ComputerUtilCombat.java
+++ b/src/main/java/forge/game/ai/ComputerUtilCombat.java
@@ -586,6 +586,9 @@ public class ComputerUtilCombat {
        final Card source = trigger.getHostCard();
        if (combat == null) {
            combat = game.getCombat();
+            if (combat == null) {
+                return false;
+            }
        }

        if (!trigger.zonesCheck(game.getZoneOf(trigger.getHostCard()))) {