From 75264c6115442c8093d59b75e899d29c9cc74a3b Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 26 Jul 2022 16:11:44 -0400 Subject: [PATCH] GoadEffect.getStackDescription support "DefinedDesc" for when Defined isn't filled at time of StackDesc --- .../main/java/forge/game/ability/effects/GoadEffect.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java b/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java index 69efb0dfe33..ad5116f444e 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java @@ -16,12 +16,13 @@ public class GoadEffect extends SpellAbilityEffect { @Override protected String getStackDescription(SpellAbility sa) { final Player player = sa.getActivatingPlayer(); - List tgt = getTargetCards(sa); - if (tgt.size() <= 0) { + List tgt = getDefinedCardsOrTargeted(sa, "Defined"); + String tgtString = sa.getParamOrDefault("DefinedDesc", Lang.joinHomogenous(tgt)); + if (tgtString.isEmpty()) { return ""; } else { final StringBuilder sb = new StringBuilder(); - sb.append(player).append(" goads ").append(Lang.joinHomogenous(tgt)).append("."); + sb.append(player).append(" goads ").append(tgtString).append("."); return sb.toString(); } }