From 3407e84965dd53780a14f4050b0d65b09b4a83c3 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 14 Dec 2016 16:17:12 +0000 Subject: [PATCH] - Temporary fix [attention required]: fill Execute parameter for SAs that are parented to Charm API. Fixes Sapphire Charm first ability crashing. Most likely requires a different fix, please correct. --- .../src/main/java/forge/game/ability/AbilityFactory.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 f8f555dbdf0..48fcf5b0a37 100644 --- a/forge-game/src/main/java/forge/game/ability/AbilityFactory.java +++ b/forge-game/src/main/java/forge/game/ability/AbilityFactory.java @@ -240,7 +240,10 @@ public final class AbilityFactory { } } - if (type != AbilityRecordType.SubAbility || parent == null) { + if (hostCard.getName().equals("Sapphire Charm")) { + System.out.println("Type: " + type + ", Parent: " + parent); + } + if (type != AbilityRecordType.SubAbility || parent == null || parent.getApi() == ApiType.Charm) { for (final String key : additionalAbilityKeys) { if (mapParams.containsKey(key) && spellAbility.getAdditonalAbility(key) == null) { spellAbility.setAdditionalAbility(key, getSubAbility(hostCard, mapParams.get(key), spellAbility));