external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-14 09:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ResolvedThisTurn' into 'master'

Browse Source 
Fix ResolvedThisTurn

See merge request core-developers/forge!4631
This commit is contained in:
Hans Mackowiak
2021-04-30 23:33:44 +00:00
parent 52d6245b4a 329f4072be
commit 7842b7e0fd
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/card/ActivationTable.java
View File

@@ -26,7 +26,7 @@ public class ActivationTable extends ForwardingTable<SpellAbility, Optional<Stat
if (root.isTrigger()) { if (root.isTrigger()) {
original = root.getTrigger().getOverridingAbility(); original = root.getTrigger().getOverridingAbility();
} else { } else {
original = ObjectUtils.defaultIfNull(root.getOriginalAbility(), sa); original = ObjectUtils.defaultIfNull(root.getOriginalAbility(), root);
} }
return original; return original;
} }