From 7f319c2751aea7a389a68951eade996b32132d85 Mon Sep 17 00:00:00 2001
From: igoudt <igoudt@bol.com>
Date: Sat, 13 Jan 2018 23:26:35 +0100
Subject: [PATCH] fix null-check in raging river and a watcher

---
 Mage.Sets/src/mage/cards/r/RagingRiver.java           |  2 ++
 ...rmanentsEnteredBattlefieldYourLastTurnWatcher.java | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/r/RagingRiver.java b/Mage.Sets/src/mage/cards/r/RagingRiver.java
index 17383e43aec..f578960b3ae 100644
--- a/Mage.Sets/src/mage/cards/r/RagingRiver.java
+++ b/Mage.Sets/src/mage/cards/r/RagingRiver.java
@@ -152,9 +152,11 @@ class RagingRiverEffect extends OneShotEffect {
                                 filter.add(Predicates.not(new AbilityPredicate(FlyingAbility.class)));
                             } else {
                                 List<Permanent> leftLog = left.stream()
+                                        .filter(permanent -> permanent.getControllerId() != null)
                                         .filter(permanent -> permanent.getControllerId().equals(defender.getId()))
                                         .collect(Collectors.toList());
                                 List<Permanent> rightLog = right.stream()
+                                        .filter(permanent -> permanent.getControllerId() != null)
                                         .filter(permanent -> permanent.getControllerId().equals(defender.getId()))
                                         .collect(Collectors.toList());
 
diff --git a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java
index 857bdd81edc..04db06ff031 100644
--- a/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/PermanentsEnteredBattlefieldYourLastTurnWatcher.java
@@ -5,16 +5,17 @@
  */
 package mage.watchers.common;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
 import mage.constants.WatcherScope;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.watchers.Watcher;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.UUID;
+
 /**
  *
  * @author LevelX2 (spjspj)
@@ -75,7 +76,7 @@ public class PermanentsEnteredBattlefieldYourLastTurnWatcher extends Watcher {
     }
 
     public List<Permanent> getPermanentsEnteringOnPlayersLastTurn(Game game, UUID playerId) {
-        if (game.getActivePlayerId() == playerId) {
+        if (game.getActivePlayerId().equals(playerId)) {
             return enteringBattlefield.get(playerId);
         }
         return enteringBattlefieldLastTurn.get(playerId);