From ea460a13e9f49bc4242f3a2ae6f1b1b3351dacd8 Mon Sep 17 00:00:00 2001 From: Phallen Cassidy Date: Fri, 19 Feb 2021 11:43:20 -0500 Subject: [PATCH] Performing player specified in chat log --- .../lotro/logic/effects/DiscardCardsFromPlayEffect.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java index cf89e9ce5..8d8b12d5a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/DiscardCardsFromPlayEffect.java @@ -69,17 +69,13 @@ public class DiscardCardsFromPlayEffect extends AbstractPreventableCardEffect { discardedCards.addAll(cards); toMoveFromZoneToDiscard.addAll(cards); - String sourcePlayer = null; - if (_source != null) - sourcePlayer = _source.getOwner(); - - gameState.removeCardsFromZone(sourcePlayer, toMoveFromZoneToDiscard); + gameState.removeCardsFromZone(_performingPlayer, toMoveFromZoneToDiscard); for (PhysicalCard card : toMoveFromZoneToDiscard) gameState.addCardToZone(game, card, Zone.DISCARD); if (_source != null && discardedCards.size() > 0) - game.getGameState().sendMessage(_source.getOwner() + " discards " + getAppendedNames(discardedCards) + " from play using " + GameUtils.getCardLink(_source)); + game.getGameState().sendMessage(_performingPlayer + " discards " + getAppendedNames(discardedCards) + " from play using " + GameUtils.getCardLink(_source)); for (PhysicalCard discardedCard : discardedCards) game.getActionsEnvironment().emitEffectResult(new DiscardCardsFromPlayResult(_source, getPerformingPlayer(), discardedCard));