From 16074a65b07a14e4c26dc6595f991a53d35cf6a5 Mon Sep 17 00:00:00 2001 From: Ryan1729 Date: Mon, 23 Sep 2019 08:24:31 -0600 Subject: [PATCH] fix incorrect runParams keys --- .../main/java/forge/game/trigger/TriggerChangesZone.java | 2 +- .../java/forge/game/trigger/TriggerCounterAddedOnce.java | 6 +++--- .../src/main/java/forge/game/trigger/TriggerExiled.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java index 8c789714486..101391ef657 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerChangesZone.java @@ -122,7 +122,7 @@ public class TriggerChangesZone extends Trigger { } if (hasParam("ValidCause")) { - if (!runParams.containsKey("Cause") ) { + if (!runParams.containsKey(AbilityKey.Cause) ) { return false; } SpellAbility cause = (SpellAbility) runParams.get(AbilityKey.Cause); diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java index 8550fdda4c4..0244c2f6785 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java @@ -64,7 +64,7 @@ public class TriggerCounterAddedOnce extends Trigger { } if (hasParam("ValidCard")) { - if (!runParams.containsKey("Card")) + if (!runParams.containsKey(AbilityKey.Card)) return false; final Card addedTo = (Card) runParams.get(AbilityKey.Card); @@ -75,7 +75,7 @@ public class TriggerCounterAddedOnce extends Trigger { } if (hasParam("ValidPlayer")) { - if (!runParams.containsKey("Player")) + if (!runParams.containsKey(AbilityKey.Player)) return false; final Player addedTo = (Player) runParams.get(AbilityKey.Player); @@ -86,7 +86,7 @@ public class TriggerCounterAddedOnce extends Trigger { } if (hasParam("ValidSource")) { - if (!runParams.containsKey("Source")) + if (!runParams.containsKey(AbilityKey.Source)) return false; final Player source = (Player) runParams.get(AbilityKey.Source); diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java b/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java index da74e2dfeca..616bf8a4c7f 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerExiled.java @@ -79,7 +79,7 @@ public class TriggerExiled extends Trigger { } if (hasParam("ValidCause")) { - if (!runParams.containsKey("Cause") ) { + if (!runParams.containsKey(AbilityKey.Cause) ) { return false; } SpellAbility cause = (SpellAbility) runParams.get(AbilityKey.Cause);