external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-12 16:58:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #657 from tool4ever/initiative

Browse Source 
Initiative fix
This commit is contained in:
Agetian
2022-06-11 15:32:17 +03:00
committed by GitHub
parent 8bdb7078ea a19f90db50
commit d485bc44cc
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -3206,7 +3206,7 @@ public class Player extends GameEntity implements Comparable<Player> {
final String damageTrig = "Mode$ DamageDoneOnceByController | ValidSource$ Player | ValidTarget$ You | " + final String damageTrig = "Mode$ DamageDoneOnceByController | ValidSource$ Player | ValidTarget$ You | " +
"CombatDamage$ True | TriggerZones$ Command | TriggerDescription$ Whenever one or more " + "CombatDamage$ True | TriggerZones$ Command | TriggerDescription$ Whenever one or more " +
"creatures a player controls deal combat damage to you, that player takes the initiative."; "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); final Trigger damageTrigger = TriggerHandler.parseTrigger(damageTrig, initiativeEffect, true);

1
forge-game/src/main/java/forge/game/trigger/TriggerDamageDoneOnceByController.java
View File

@@ -36,7 +36,6 @@ public class TriggerDamageDoneOnceByController extends Trigger {
@Override @Override
public void setTriggeringObjects(SpellAbility sa, Map<AbilityKey, Object> runParams) { public void setTriggeringObjects(SpellAbility sa, Map<AbilityKey, Object> runParams) {
Object target = runParams.get(AbilityKey.DamageTarget); Object target = runParams.get(AbilityKey.DamageTarget);
if (target instanceof Card) { if (target instanceof Card) {
target = CardUtil.getLKICopy((Card)runParams.get(AbilityKey.DamageTarget)); target = CardUtil.getLKICopy((Card)runParams.get(AbilityKey.DamageTarget));