github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[minor] code style

Browse source
This commit is contained in:
North 2012-12-20 23:03:40 +02:00
parent ca50bc39e0
commit 18b4be3ec7
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Mage/src/mage/game/match/MatchImpl.java
View file

@ -45,8 +45,6 @@ import java.util.*;
*/
public abstract class MatchImpl implements Match {
// private final static Logger logger = Logging.getLogger(MatchImpl.class.getName());
protected UUID id = UUID.randomUUID();
protected String name;
protected List<MatchPlayer> players = new ArrayList<MatchPlayer>();
@ -67,9 +65,10 @@ public abstract class MatchImpl implements Match {
@Override
public MatchPlayer getPlayer(UUID playerId) {
for (MatchPlayer player: players) {
if (player.getPlayer().getId().equals(playerId))
if (player.getPlayer().getId().equals(playerId)) {
return player;
}
}
return null;
}
@ -111,7 +110,9 @@ public abstract class MatchImpl implements Match {
@Override
public Game getGame() {
if (games.size() == 0) return null;
if (games.isEmpty()) {
return null;
}
return games.get(games.size() -1);
}
@ -150,13 +151,15 @@ public abstract class MatchImpl implements Match {
for (MatchPlayer player: this.players) {
Player p = game.getPlayer(player.getPlayer().getId());
if (p != null) {
if (p.hasWon())
if (p.hasWon()) {
player.addWin();
if (p.hasLost())
}
if (p.hasLost()) {
player.addLose();
}
}
}
}
@Override
public UUID getChooser() {
@ -164,8 +167,7 @@ public abstract class MatchImpl implements Match {
Game game = getGame();
for (MatchPlayer player: this.players) {
Player p = game.getPlayer(player.getPlayer().getId());
if (p != null) {
if (p.hasLost())
if (p != null && p.hasLost()) {
loserId = p.getId();
}
}
@ -195,9 +197,10 @@ public abstract class MatchImpl implements Match {
@Override
public boolean isDoneSideboarding() {
for (MatchPlayer player: this.players) {
if (!player.isDoneSideboarding())
if (!player.isDoneSideboarding()) {
return false;
}
}
return true;
}