external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 19:28:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using java.util.Objects (wasn't even necessary here)

Browse Source
This commit is contained in:
elcnesh
2015-06-08 06:44:36 +00:00
parent 64c52f5dfb
commit 72158229f0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui/src/main/java/forge/match/AbstractGuiGame.java
View File

@@ -5,7 +5,6 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
@@ -103,6 +102,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
if (player == null) { if (player == null) {
throw new IllegalArgumentException(); throw new IllegalArgumentException();
} }
if (gameController == null) { if (gameController == null) {
if (originalGameControllers.containsKey(player)) { if (originalGameControllers.containsKey(player)) {
gameControllers.put(player, originalGameControllers.get(player)); gameControllers.put(player, originalGameControllers.get(player));
@@ -110,7 +110,7 @@ public abstract class AbstractGuiGame implements IGuiGame, IMayViewCards {
gameControllers.remove(player); gameControllers.remove(player);
autoPassUntilEndOfTurn.remove(player); autoPassUntilEndOfTurn.remove(player);
final PlayerView currentPlayer = getCurrentPlayer(); final PlayerView currentPlayer = getCurrentPlayer();
if (Objects.equals(player, currentPlayer)) { if (player.equals(currentPlayer)) {
// set current player to a value known to be legal // set current player to a value known to be legal
setCurrentPlayer(Iterables.getFirst(gameControllers.keySet(), null)); setCurrentPlayer(Iterables.getFirst(gameControllers.keySet(), null));
} }