From c8d58efa7ff36a0d1a1a975e6856a4e98b8a5ce8 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 28 May 2018 15:53:46 -0400 Subject: [PATCH] Fixed effects that use opponents' life loss, including Rakdos, Lord of Riots and Neheb the Eternal --- .../java/mage/watchers/common/PlayerLostLifeWatcher.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java index bd4ca446a86..69d7dcec4ed 100644 --- a/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/PlayerLostLifeWatcher.java @@ -34,6 +34,7 @@ import java.util.UUID; import mage.constants.WatcherScope; import mage.game.Game; import mage.game.events.GameEvent; +import mage.players.Player; import mage.watchers.Watcher; /* @@ -81,8 +82,9 @@ public class PlayerLostLifeWatcher extends Watcher { public int getAllOppLifeLost(UUID playerId, Game game) { int amount = 0; for (UUID opponentId : this.amountOfLifeLostThisTurn.keySet()) { - if (game.getOpponents(playerId).contains(opponentId)) { - amount += this.amountOfLifeLostThisTurn.get(playerId); + Player opponent = game.getPlayer(opponentId); + if (opponent != null && opponent.hasOpponent(playerId, game)) { + amount += this.amountOfLifeLostThisTurn.getOrDefault(opponentId, 0); } } return amount;