From a19f90db50cb697a35035e9b808b7f64db1c074d Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Sat, 11 Jun 2022 14:01:54 +0200 Subject: [PATCH] Initiative fix --- forge-game/src/main/java/forge/game/player/Player.java | 2 +- .../forge/game/trigger/TriggerDamageDoneOnceByController.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 658cf02a6bf..73cbf35e0db 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -3206,7 +3206,7 @@ public class Player extends GameEntity implements Comparable { final String damageTrig = "Mode$ DamageDoneOnceByController | ValidSource$ Player | ValidTarget$ You | " + "CombatDamage$ True | TriggerZones$ Command | TriggerDescription$ Whenever one or more " + "creatures a player controls deal combat damage to you, that player takes the initiative."; - final String damageEff = "DB$ TakeInitiative | Defined$ TriggeredAttackingPlayer"; + final String damageEff = "DB$ TakeInitiative | Defined$ TriggeredSource"; final Trigger damageTrigger = TriggerHandler.parseTrigger(damageTrig, initiativeEffect, true); diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnceByController.java b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnceByController.java index a96243d52aa..8d118146261 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnceByController.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnceByController.java @@ -36,7 +36,6 @@ public class TriggerDamageDoneOnceByController extends Trigger { @Override public void setTriggeringObjects(SpellAbility sa, Map runParams) { - Object target = runParams.get(AbilityKey.DamageTarget); if (target instanceof Card) { target = CardUtil.getLKICopy((Card)runParams.get(AbilityKey.DamageTarget));