From 17d41ef165ceeda8babadb627a8e87d159c0173b Mon Sep 17 00:00:00 2001 From: Northmoc Date: Tue, 3 May 2022 14:41:45 -0400 Subject: [PATCH] ManaEffect > getStackDescription() try to dodge NPE --- .../java/forge/game/ability/effects/ManaEffect.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java index e03f72f8843..5a4521adae4 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/ManaEffect.java @@ -270,9 +270,14 @@ public class ManaEffect extends SpellAbilityEffect { ? GameActionUtil.generatedMana(sa) : "mana"; sb.append("Add ").append(toManaString(mana)).append("."); if (sa.hasParam("RestrictValid")) { - String desc = sa.getDescription(); - int i = desc.indexOf("Spend this"); - sb.append(" ").append(desc, i, desc.indexOf(".", i) + 1); + sb.append(" "); + final String desc = sa.getDescription(); + if (desc.contains("Spend this") && desc.contains(".")) { + int i = desc.indexOf("Spend this"); + sb.append(desc, i, desc.indexOf(".", i) + 1); + } else { + sb.append("[failed to add RestrictValid to StackDesc]"); + } } return sb.toString(); }