From f5db3f44308d9da2303ee6572aa626e9fb7a352b Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Sun, 17 Mar 2013 22:15:01 +0000 Subject: [PATCH] minimal style changes --- src/main/java/forge/game/player/LobbyPlayer.java | 5 +---- src/main/java/forge/gui/match/ControlWinLose.java | 10 ++++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/forge/game/player/LobbyPlayer.java b/src/main/java/forge/game/player/LobbyPlayer.java index aaf035abe8f..2efb0d9281d 100644 --- a/src/main/java/forge/game/player/LobbyPlayer.java +++ b/src/main/java/forge/game/player/LobbyPlayer.java @@ -65,10 +65,7 @@ public class LobbyPlayer implements IHasIcon { } else if (!name.equals(other.name)) { return false; } - if (type != other.type) { - return false; - } - return true; + return type == other.type; } public int getAvatarIndex() { diff --git a/src/main/java/forge/gui/match/ControlWinLose.java b/src/main/java/forge/gui/match/ControlWinLose.java index 3fb23292af5..08b0d092680 100644 --- a/src/main/java/forge/gui/match/ControlWinLose.java +++ b/src/main/java/forge/gui/match/ControlWinLose.java @@ -15,6 +15,7 @@ import forge.game.GameOutcome; import forge.game.GameType; import forge.game.MatchController; import forge.game.player.Player; +import forge.game.player.PlayerType; import forge.game.zone.ZoneType; import forge.gui.GuiChoose; import forge.gui.SOverlayUtils; @@ -119,9 +120,10 @@ public class ControlWinLose { } for (Player p : Singletons.getModel().getGame().getRegisteredPlayers()) { - if (!p.getName().equals(lastGame.getWinner().getName())) { - continue; // not a loser + if (!p.getLobbyPlayer().equals(lastGame.getWinner())) { + continue; } + // p is winner by this point // remove all the lost cards from owners' decks List losses = new ArrayList(); @@ -142,8 +144,8 @@ public class ControlWinLose { } } - // offer to winner, if he is human - if (p.isHuman()) { + // offer to winner, if he is local human + if (p.getLobbyPlayer().getType() == PlayerType.HUMAN) { List chosen = GuiChoose.noneOrMany("Select cards to add to your deck", losses); if (null != chosen) { Deck d = match.getPlayersDeck(p.getLobbyPlayer());