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

AbilityFactory: getSubAbility now warns better what SVar is missing

Browse Source
This commit is contained in:
Hanmac
2016-07-27 06:35:46 +00:00
parent e7b3b33c52
commit 416fd1de47
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/ability/AbilityFactory.java
View File

@@ -189,7 +189,7 @@ public final class AbilityFactory {
} }
if (mapParams.containsKey("SubAbility")) { if (mapParams.containsKey("SubAbility")) {
spellAbility.setSubAbility(getSubAbility(hostCard, hostCard.getSVar(mapParams.get("SubAbility")))); spellAbility.setSubAbility(getSubAbility(hostCard, mapParams.get("SubAbility")));
} }
if (spellAbility instanceof SpellApiBased && hostCard.isPermanent()) { if (spellAbility instanceof SpellApiBased && hostCard.isPermanent()) {
@@ -348,10 +348,10 @@ public final class AbilityFactory {
*/ */
private static final AbilitySub getSubAbility(Card hostCard, String sSub) { private static final AbilitySub getSubAbility(Card hostCard, String sSub) {
if (!sSub.equals("")) { if (hostCard.hasSVar(sSub)) {
return (AbilitySub) AbilityFactory.getAbility(sSub, hostCard); return (AbilitySub) AbilityFactory.getAbility(hostCard, sSub);
} }
System.out.println("SubAbility not found for: " + hostCard); System.out.println("SubAbility '"+ sSub +"' not found for: " + hostCard);
return null; return null;
} }