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

AbilityUtils: add more fixes for stuff like Skill Borrower

Browse Source
This commit is contained in:
Hanmac
2016-12-03 19:33:12 +00:00
parent 32bd46f0e0
commit 02221b9fe2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -1683,7 +1683,14 @@ public class AbilityUtils {
val = ((SpellAbility) ability).getSVar(sVarName); val = ((SpellAbility) ability).getSVar(sVarName);
} }
if (StringUtils.isEmpty(val)) { if (StringUtils.isEmpty(val)) {
val = ability.getHostCard().getSVar(sVarName); Card host = null;
if (ability instanceof SpellAbility) {
host = ((SpellAbility) ability).getOriginalHost();
}
if (host == null) {
host = ability.getHostCard();
}
val = host.getSVar(sVarName);
} }
if (!ability.isIntrinsic() || StringUtils.isEmpty(val)) { if (!ability.isIntrinsic() || StringUtils.isEmpty(val)) {
return val; return val;