From f99e055d8a3af00dcea65a6ac3cef67f819577c1 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sat, 7 Nov 2020 12:42:37 -0500 Subject: [PATCH 1/2] Tokenizer CARDNAME substitution fix --- .../src/main/java/forge/game/ability/SpellAbilityEffect.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java index 3708abf4cf6..1ba76c5c452 100644 --- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java +++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java @@ -158,7 +158,7 @@ public abstract class SpellAbilityEffect { if (isPlainText) { if(t.startsWith("NICKNAME")) { sb.append(TextUtil.fastReplace(t,"NICKNAME", sa.getHostCard().getName().split(",")[0])); - } else { + } else if(t.startsWith("CARDNAME")) { sb.append(TextUtil.fastReplace(t, "CARDNAME", sa.getHostCard().getName())); } } else { From 1f05c3f89595c1deb69ff52c32959b434855294f Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sun, 8 Nov 2020 08:35:45 -0500 Subject: [PATCH 2/2] style fix --- .../src/main/java/forge/game/ability/SpellAbilityEffect.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java index 1ba76c5c452..25bcd06e722 100644 --- a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java +++ b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java @@ -156,9 +156,9 @@ public abstract class SpellAbilityEffect { if ("}".equals(t)) { isPlainText = true; continue; } if (isPlainText) { - if(t.startsWith("NICKNAME")) { + if (t.startsWith("NICKNAME")) { sb.append(TextUtil.fastReplace(t,"NICKNAME", sa.getHostCard().getName().split(",")[0])); - } else if(t.startsWith("CARDNAME")) { + } else if (t.startsWith("CARDNAME")) { sb.append(TextUtil.fastReplace(t, "CARDNAME", sa.getHostCard().getName())); } } else {