From 1c60c6d537b7230b3de62c487da8205849d8546d Mon Sep 17 00:00:00 2001 From: Northmoc Date: Sat, 23 Apr 2022 00:04:51 -0400 Subject: [PATCH] CountersPutEffect update imports and catch getStackDesc NPE --- .../game/ability/effects/CountersPutEffect.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java index 855749ffdae..1478b8b7325 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/CountersPutEffect.java @@ -16,14 +16,7 @@ import forge.game.ability.AbilityFactory; import forge.game.ability.AbilityKey; import forge.game.ability.AbilityUtils; import forge.game.ability.SpellAbilityEffect; -import forge.game.card.Card; -import forge.game.card.CardCollection; -import forge.game.card.CardFactoryUtil; -import forge.game.card.CardLists; -import forge.game.card.CardPredicates; -import forge.game.card.CardUtil; -import forge.game.card.CounterEnumType; -import forge.game.card.CounterType; +import forge.game.card.*; import forge.game.event.GameEventRandomLog; import forge.game.player.Player; import forge.game.player.PlayerActionConfirmMode; @@ -50,8 +43,10 @@ public class CountersPutEffect extends SpellAbilityEffect { if (spellAbility.hasParam("CounterTypes")) { stringBuilder.append(spellAbility.getActivatingPlayer()).append(" "); String desc = spellAbility.getDescription(); - desc = desc.substring(desc.indexOf("Put"), desc.indexOf(" on ") + 4) - .replaceFirst("Put", "puts"); + if (desc.contains("Put")) { + desc = desc.substring(desc.indexOf("Put"), desc.indexOf(" on ") + 4) + .replaceFirst("Put", "puts"); + } stringBuilder.append(desc).append(Lang.joinHomogenous(getTargets(spellAbility))).append("."); return stringBuilder.toString(); }