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

minimal style changes

Browse Source
This commit is contained in:
Maxmtg
2013-03-17 22:15:01 +00:00
parent ada6e258e7
commit f5db3f4430
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/forge/game/player/LobbyPlayer.java
View File

@@ -65,10 +65,7 @@ public class LobbyPlayer implements IHasIcon {
} else if (!name.equals(other.name)) { } else if (!name.equals(other.name)) {
return false; return false;
} }
if (type != other.type) { return type == other.type;
return false;
}
return true;
} }
public int getAvatarIndex() { public int getAvatarIndex() {

10
src/main/java/forge/gui/match/ControlWinLose.java
View File

@@ -15,6 +15,7 @@ import forge.game.GameOutcome;
import forge.game.GameType; import forge.game.GameType;
import forge.game.MatchController; import forge.game.MatchController;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.player.PlayerType;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.gui.GuiChoose; import forge.gui.GuiChoose;
import forge.gui.SOverlayUtils; import forge.gui.SOverlayUtils;
@@ -119,9 +120,10 @@ public class ControlWinLose {
} }
for (Player p : Singletons.getModel().getGame().getRegisteredPlayers()) { for (Player p : Singletons.getModel().getGame().getRegisteredPlayers()) {
if (!p.getName().equals(lastGame.getWinner().getName())) { if (!p.getLobbyPlayer().equals(lastGame.getWinner())) {
continue; // not a loser continue;
} }
// p is winner by this point
// remove all the lost cards from owners' decks // remove all the lost cards from owners' decks
List<CardPrinted> losses = new ArrayList<CardPrinted>(); List<CardPrinted> losses = new ArrayList<CardPrinted>();
@@ -142,8 +144,8 @@ public class ControlWinLose {
} }
} }
// offer to winner, if he is human // offer to winner, if he is local human
if (p.isHuman()) { if (p.getLobbyPlayer().getType() == PlayerType.HUMAN) {
List<CardPrinted> chosen = GuiChoose.noneOrMany("Select cards to add to your deck", losses); List<CardPrinted> chosen = GuiChoose.noneOrMany("Select cards to add to your deck", losses);
if (null != chosen) { if (null != chosen) {
Deck d = match.getPlayersDeck(p.getLobbyPlayer()); Deck d = match.getPlayersDeck(p.getLobbyPlayer());