From 416fd1de47bafc413a44a2f4e8933144d0a9c9e0 Mon Sep 17 00:00:00 2001 From: Hanmac Date: Wed, 27 Jul 2016 06:35:46 +0000 Subject: [PATCH] AbilityFactory: getSubAbility now warns better what SVar is missing --- .../src/main/java/forge/game/ability/AbilityFactory.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java index 40c61a2d004..05ed2ca67e8 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java @@ -189,7 +189,7 @@ public final class AbilityFactory { } 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()) { @@ -348,10 +348,10 @@ public final class AbilityFactory { */ private static final AbilitySub getSubAbility(Card hostCard, String sSub) { - if (!sSub.equals("")) { - return (AbilitySub) AbilityFactory.getAbility(sSub, hostCard); + if (hostCard.hasSVar(sSub)) { + 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; }