diff --git a/Mage.Sets/src/mage/cards/c/CustodiSquire.java b/Mage.Sets/src/mage/cards/c/CustodiSquire.java index f0640cf0e9b..427029968bc 100644 --- a/Mage.Sets/src/mage/cards/c/CustodiSquire.java +++ b/Mage.Sets/src/mage/cards/c/CustodiSquire.java @@ -91,7 +91,7 @@ class CustodiSquireVoteEffect extends OneShotEffect { player.chooseTarget(outcome, possibleCards, target, source, game); Card card = game.getCard(target.getFirstTarget()); if (card != null) { - game.informPlayers(player.getName() + " voted for " + card.getLogName()); + game.informPlayers(player.getLogName() + " voted for " + card.getLogName()); if (!cardCounter.containsKey(target.getFirstTarget())) { cardCounter.put(target.getFirstTarget(), 1); } else { diff --git a/Mage.Sets/src/mage/cards/d/DecoyGambit.java b/Mage.Sets/src/mage/cards/d/DecoyGambit.java index b888d1f2ccd..a7751d67706 100644 --- a/Mage.Sets/src/mage/cards/d/DecoyGambit.java +++ b/Mage.Sets/src/mage/cards/d/DecoyGambit.java @@ -110,10 +110,10 @@ class DecoyGambitEffect extends OneShotEffect { } if (player.chooseUse(outcome, "Have " + controller.getName() + " draw a card? If you don't, " + permanent.getName() + " will be returned to its owner's hand.", source, game)) { - game.informPlayers(player.getName() + " chose to have " + controller.getName() + " draw a card."); + game.informPlayers(player.getLogName() + " chose to have " + controller.getName() + " draw a card."); numberOfCardsToDraw += 1; } else { - game.informPlayers(player.getName() + " chose to have their creature returned to their hand."); + game.informPlayers(player.getLogName() + " chose to have their creature returned to their hand."); permanentToHand.add(permanent); } } diff --git a/Mage.Sets/src/mage/cards/d/DistantMemories.java b/Mage.Sets/src/mage/cards/d/DistantMemories.java index ab0f742909b..d7c1f382199 100644 --- a/Mage.Sets/src/mage/cards/d/DistantMemories.java +++ b/Mage.Sets/src/mage/cards/d/DistantMemories.java @@ -79,9 +79,9 @@ class DistantMemoriesEffect extends OneShotEffect { if (opponent != null) { if (opponent.chooseUse(Outcome.Detriment, sb.toString(), source, game)) { putInHand = true; - game.informPlayers(opponent.getName() + " decides to put the selected card into the player's hand."); + game.informPlayers(opponent.getLogName() + " decides to put the selected card into the player's hand."); } else { - game.informPlayers(opponent.getName() + " decides to leave the card in exile."); + game.informPlayers(opponent.getLogName() + " decides to leave the card in exile."); } } } diff --git a/Mage.Sets/src/mage/cards/e/Expropriate.java b/Mage.Sets/src/mage/cards/e/Expropriate.java index 2bcd00c6390..e06d8de0834 100644 --- a/Mage.Sets/src/mage/cards/e/Expropriate.java +++ b/Mage.Sets/src/mage/cards/e/Expropriate.java @@ -85,9 +85,9 @@ class ExpropriateDilemmaEffect extends CouncilsDilemmaVoteEffect { private void turnsForTimeVote(int timeCount, Player controller, Game game, Ability source) { if (timeCount == 1) { - game.informPlayers(controller.getName() + " will take an extra turn"); + game.informPlayers(controller.getLogName() + " will take an extra turn"); } else { - game.informPlayers(controller.getName() + " will take " + timeCount + " extra turns"); + game.informPlayers(controller.getLogName() + " will take " + timeCount + " extra turns"); } do { game.getState().getTurnMods().add(new TurnMod(source.getControllerId(), false)); @@ -119,7 +119,7 @@ class ExpropriateDilemmaEffect extends CouncilsDilemmaVoteEffect { ContinuousEffect effect = new ExpropriateControlEffect(controller.getId()); effect.setTargetPointer(new FixedTarget(permanent, game)); game.addEffect(effect, source); - game.informPlayers(controller.getName() + " gained control of " + permanent.getIdName() + " owned by " + game.getPlayer(permanent.getOwnerId()).getName()); + game.informPlayers(controller.getLogName() + " gained control of " + permanent.getIdName() + " owned by " + game.getPlayer(permanent.getOwnerId()).getName()); } } } @@ -133,10 +133,10 @@ class ExpropriateDilemmaEffect extends CouncilsDilemmaVoteEffect { "Choose " + choiceOne + " or " + choiceTwo + "?", source.getRule(), choiceOne, choiceTwo, source, game)) { voteOneCount++; - game.informPlayers(player.getName() + " has voted for " + choiceOne); + game.informPlayers(player.getLogName() + " has voted for " + choiceOne); } else { voteTwoCount++; - game.informPlayers(player.getName() + " has voted for " + choiceTwo); + game.informPlayers(player.getLogName() + " has voted for " + choiceTwo); choiceTwoVoters.add(player.getId()); } } diff --git a/Mage.Sets/src/mage/cards/n/NeganTheColdBlooded.java b/Mage.Sets/src/mage/cards/n/NeganTheColdBlooded.java index 14d621c29ae..52e27d0d563 100644 --- a/Mage.Sets/src/mage/cards/n/NeganTheColdBlooded.java +++ b/Mage.Sets/src/mage/cards/n/NeganTheColdBlooded.java @@ -21,6 +21,7 @@ import mage.target.TargetPermanent; import mage.target.common.TargetOpponent; import java.util.HashSet; +import java.util.Objects; import java.util.Set; import java.util.UUID; @@ -107,11 +108,11 @@ class NeganTheColdBloodedEffect extends OneShotEffect { if (permanent == null) { continue; } - if (controllerChoice.equals(creatureId)) { - game.informPlayers(controller.getName() + " chose " + permanent.getIdName()); + if (Objects.equals(controllerChoice, creatureId)) { + game.informPlayers(controller.getLogName() + " chose " + permanent.getIdName()); } - if (opponentChoice.equals(creatureId)) { - game.informPlayers(opponent.getName() + " chose " + permanent.getIdName()); + if (Objects.equals(opponentChoice, creatureId)) { + game.informPlayers(opponent.getLogName() + " chose " + permanent.getIdName()); } permanent.sacrifice(source, game); } diff --git a/Mage.Sets/src/mage/cards/n/NivMizzetReborn.java b/Mage.Sets/src/mage/cards/n/NivMizzetReborn.java index 18b9d02603c..ef7707ab9e2 100644 --- a/Mage.Sets/src/mage/cards/n/NivMizzetReborn.java +++ b/Mage.Sets/src/mage/cards/n/NivMizzetReborn.java @@ -133,7 +133,7 @@ class NivMizzetRebornEffect extends OneShotEffect { return false; } Cards cards = new CardsImpl(player.getLibrary().getTopCards(game, 10)); - game.informPlayers(player.getName() + " reveals " + + game.informPlayers(player.getLogName() + " reveals " + cards.getCards(game).stream().map(card -> card.getName() + " ").reduce((a, b) -> a + b)); Cards cards2 = new CardsImpl(); if (cards.isEmpty()) { @@ -156,7 +156,7 @@ class NivMizzetRebornEffect extends OneShotEffect { player.putCardsOnBottomOfLibrary(cards, game, source, false); if (player.moveCards(cards2, Zone.HAND, source, game)) { for (Card card : cards2.getCards(game)) { - game.informPlayers(player.getName() + " chose " + card.getName() + " and put it into their hand."); + game.informPlayers(player.getLogName() + " chose " + card.getName() + " and put it into their hand."); } } return true; diff --git a/Mage.Sets/src/mage/cards/s/ScryingGlass.java b/Mage.Sets/src/mage/cards/s/ScryingGlass.java index ff7699cdbde..b7446239089 100644 --- a/Mage.Sets/src/mage/cards/s/ScryingGlass.java +++ b/Mage.Sets/src/mage/cards/s/ScryingGlass.java @@ -70,11 +70,11 @@ class ScryingGlassEffect extends OneShotEffect { filter.add(new ColorPredicate(color.getColor())); targetOpponent.revealCards(source, targetOpponent.getHand(), game); if (targetOpponent.getHand().count(filter, game) == amount) { - game.informPlayers(controller.getName() + " has chosen the exact number and color of the revealed cards from " + targetOpponent.getName() + "'s hand. They draw a card."); + game.informPlayers(controller.getLogName() + " has chosen the exact number and color of the revealed cards from " + targetOpponent.getName() + "'s hand. They draw a card."); controller.drawCards(1, source, game); return true; } else { - game.informPlayers(controller.getName() + " has chosen incorrectly and will not draw a card."); + game.informPlayers(controller.getLogName() + " has chosen incorrectly and will not draw a card."); } } return false; diff --git a/Mage.Sets/src/mage/cards/t/TruthOrTale.java b/Mage.Sets/src/mage/cards/t/TruthOrTale.java index f3e71e5efb2..d17da9e887f 100644 --- a/Mage.Sets/src/mage/cards/t/TruthOrTale.java +++ b/Mage.Sets/src/mage/cards/t/TruthOrTale.java @@ -107,7 +107,7 @@ class TruthOrTaleEffect extends OneShotEffect { Card finalChosenCard = game.getCard(finalChosenCardTarget.getFirstTarget()); if (finalChosenCard != null) { if (!game.isSimulation()) { - game.informPlayers(controller.getName() + " chose to put " + finalChosenCard.getIdName() + " into their hand."); + game.informPlayers(controller.getLogName() + " chose to put " + finalChosenCard.getIdName() + " into their hand."); } cards.remove(finalChosenCard); controller.moveCards(finalChosenCard, Zone.HAND, source, game); diff --git a/Mage.Sets/src/mage/cards/w/WheelOfMisfortune.java b/Mage.Sets/src/mage/cards/w/WheelOfMisfortune.java index 6d3799599ff..22fe637b801 100644 --- a/Mage.Sets/src/mage/cards/w/WheelOfMisfortune.java +++ b/Mage.Sets/src/mage/cards/w/WheelOfMisfortune.java @@ -70,7 +70,7 @@ class WheelOfMisfortuneEffect extends OneShotEffect { if (player == null) { continue; } - game.informPlayers(player.getName() + " chose " + entry.getValue()); + game.informPlayers(player.getLogName() + " chose " + entry.getValue()); } int maxValue = playerMap.values().stream().mapToInt(x -> x).max().orElse(0); game.informPlayers("The highest number chosen was " + maxValue); diff --git a/Mage/src/main/java/mage/abilities/effects/common/CouncilsDilemmaVoteEffect.java b/Mage/src/main/java/mage/abilities/effects/common/CouncilsDilemmaVoteEffect.java index 87ab736ab1e..dbd6263b5b1 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/CouncilsDilemmaVoteEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/CouncilsDilemmaVoteEffect.java @@ -30,10 +30,10 @@ public abstract class CouncilsDilemmaVoteEffect extends OneShotEffect { "Choose " + choiceOne + " or " + choiceTwo + "?", source.getRule(), choiceOne, choiceTwo, source, game)) { voteOneCount++; - game.informPlayers(player.getName() + " has voted for " + choiceOne); + game.informPlayers(player.getLogName() + " has voted for " + choiceOne); } else { voteTwoCount++; - game.informPlayers(player.getName() + " has voted for " + choiceTwo); + game.informPlayers(player.getLogName() + " has voted for " + choiceTwo); } } } diff --git a/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java b/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java index b54a38486d7..aa28778987d 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/counter/ProliferateEffect.java @@ -77,7 +77,7 @@ public class ProliferateEffect extends OneShotEffect { player.addCounters(newCounter, source, game); } if (newCounter != null) { - game.informPlayers(player.getName() + game.informPlayers(player.getLogName() + " had 1 " + newCounter.getName() + " counter added to them.");