From ffc24faa5a99444ccf0e1d6ad4d3772fd8dba7b3 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 26 May 2022 20:23:23 -0400 Subject: [PATCH] TakeInitiativeEffect improve stackDesc and Resolve --- .../game/ability/effects/TakeInitiativeEffect.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/TakeInitiativeEffect.java b/forge-game/src/main/java/forge/game/ability/effects/TakeInitiativeEffect.java index 5be0cf544bf..9fa95a288a5 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/TakeInitiativeEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/TakeInitiativeEffect.java @@ -2,11 +2,10 @@ package forge.game.ability.effects; import java.util.List; -import forge.game.Game; import forge.game.ability.SpellAbilityEffect; import forge.game.player.Player; import forge.game.spellability.SpellAbility; -import org.apache.commons.lang3.StringUtils; +import forge.util.Lang; public class TakeInitiativeEffect extends SpellAbilityEffect { @@ -16,8 +15,8 @@ public class TakeInitiativeEffect extends SpellAbilityEffect { final List tgtPlayers = getTargetPlayers(sa); - sb.append(StringUtils.join(tgtPlayers, ", ")); - sb.append(" takes the initiative."); + sb.append(Lang.joinHomogenous(tgtPlayers)).append(tgtPlayers.size() == 1 ? " takes" : " take"); + sb.append(" the initiative."); return sb.toString(); } @@ -28,9 +27,8 @@ public class TakeInitiativeEffect extends SpellAbilityEffect { final String set = sa.getHostCard().getSetCode(); for (final Player p : getTargetPlayers(sa)) { - final Game game = p.getGame(); if (!sa.usesTargeting() || p.canBeTargetedBy(sa)) { - game.getAction().takeInitiative(p, set); + p.getGame().getAction().takeInitiative(p, set); } } }