From cc7a87c80fdccff7545f77c16c8b99646ac8c426 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Thu, 23 Nov 2017 21:59:09 -0800 Subject: [PATCH] Fixing a NPU in DiscardCardsFromPlayEffect --- .../lotro/logic/effects/DiscardCardsFromPlayEffect.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 0abc1534b..e04687419 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 @@ -50,7 +50,9 @@ public class DiscardCardsFromPlayEffect extends AbstractPreventableCardEffect { final String performingPlayer = _performingPlayer; if (performingPlayer != null) return performingPlayer; - return _source.getOwner(); + if (_source != null) + return _source.getOwner(); + return null; } @Override