- Fixed "precombat main phase" triggers

2025-11-18 03:38:01 +00:00 · 2018-04-05 22:07:15 +08:00
parent d61aeb09c0
commit 45b6f1a6ef
14 changed files with 19 additions and 13 deletions
--- a/forge-game/src/main/java/forge/game/trigger/Trigger.java
+++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java
@@ -235,6 +235,12 @@ public abstract class Trigger extends TriggerReplacementBase {
            }
        }

+        if (this.mapParams.containsKey("PreCombatMain")) {
+            if (!phaseHandler.isPreCombatMain()) {
+                return false;
+            }
+        }
+
        if (this.mapParams.containsKey("PlayerTurn")) {
            if (!phaseHandler.isPlayerTurn(this.getHostCard().getController())) {
                return false;