From 72158229f0845e338ddbcc79a550df89253e1e54 Mon Sep 17 00:00:00 2001 From: elcnesh Date: Mon, 8 Jun 2015 06:44:36 +0000 Subject: [PATCH] Avoid using java.util.Objects (wasn't even necessary here) --- forge-gui/src/main/java/forge/match/AbstractGuiGame.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java index 207c17e4f39..e8f248136e0 100644 --- a/forge-gui/src/main/java/forge/match/AbstractGuiGame.java +++ b/forge-gui/src/main/java/forge/match/AbstractGuiGame.java @@ -5,7 +5,6 @@ import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; import java.util.Timer; import java.util.TimerTask; @@ -103,6 +102,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards { if (player == null) { throw new IllegalArgumentException(); } + if (gameController == null) { if (originalGameControllers.containsKey(player)) { gameControllers.put(player, originalGameControllers.get(player)); @@ -110,7 +110,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards { gameControllers.remove(player); autoPassUntilEndOfTurn.remove(player); final PlayerView currentPlayer = getCurrentPlayer(); - if (Objects.equals(player, currentPlayer)) { + if (player.equals(currentPlayer)) { // set current player to a value known to be legal setCurrentPlayer(Iterables.getFirst(gameControllers.keySet(), null)); }