From 26ca873eb6da3da496f6f0954f18ca90d2669a6b Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Mon, 15 Jul 2013 23:56:10 +0200 Subject: [PATCH] [minor] Some text renaming. --- .../main/java/mage/server/TableController.java | 2 +- Mage/src/mage/game/match/MatchImpl.java | 16 ++++++++-------- Mage/src/mage/game/match/MatchPlayer.java | 12 ++++++------ Mage/src/mage/players/Player.java | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/TableController.java b/Mage.Server/src/main/java/mage/server/TableController.java index 16d689e9667..5ff92857d9c 100644 --- a/Mage.Server/src/main/java/mage/server/TableController.java +++ b/Mage.Server/src/main/java/mage/server/TableController.java @@ -370,7 +370,7 @@ public class TableController { String creator = null; String opponent = null; for (Entry entry: userPlayerMap.entrySet()) { - if (!match.getPlayer(entry.getValue()).hasQuitted()) { + if (!match.getPlayer(entry.getValue()).hasQuit()) { User user = UserManager.getInstance().getUser(entry.getKey()); if (user != null) { user.gameStarted(match.getGame().getId(), entry.getValue()); diff --git a/Mage/src/mage/game/match/MatchImpl.java b/Mage/src/mage/game/match/MatchImpl.java index e1e3816635f..b12c7f43745 100644 --- a/Mage/src/mage/game/match/MatchImpl.java +++ b/Mage/src/mage/game/match/MatchImpl.java @@ -119,7 +119,7 @@ public abstract class MatchImpl implements Match { public boolean isMatchOver() { int activePlayers = 0; for (MatchPlayer player: players) { - if (!player.hasQuitted()) { + if (!player.hasQuit()) { activePlayers++; } if (player.getWins() >= options.getWinsNeeded()) { @@ -165,7 +165,7 @@ public abstract class MatchImpl implements Match { protected void initGame(Game game) throws GameException { shufflePlayers(); for (MatchPlayer matchPlayer: this.players) { - if (!matchPlayer.hasQuitted()) { + if (!matchPlayer.hasQuit()) { matchPlayer.getPlayer().init(game); game.loadCards(matchPlayer.getDeck().getCards(), matchPlayer.getPlayer().getId()); game.loadCards(matchPlayer.getDeck().getSideboard(), matchPlayer.getPlayer().getId()); @@ -193,8 +193,8 @@ public abstract class MatchImpl implements Match { if (game.getPriorityTime() > 0) { player.setPriorityTimeLeft(p.getPriorityTimeLeft()); } - if (p.hasQuitted()) { - player.setQuitted(true); + if (p.hasQuit()) { + player.setQuit(true); } if (p.hasWon()) { player.addWin(); @@ -212,7 +212,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 && p.hasLost() && !p.hasQuitted()) { + if (p != null && p.hasLost() && !p.hasQuit()) { loserId = p.getId(); } } @@ -227,7 +227,7 @@ public abstract class MatchImpl implements Match { @Override public void sideboard() { for (MatchPlayer player: this.players) { - if (!player.hasQuitted()) { + if (!player.hasQuit()) { player.setSideboarding(); player.getPlayer().sideboard(this, player.getDeck()); } @@ -244,7 +244,7 @@ public abstract class MatchImpl implements Match { @Override public boolean isDoneSideboarding() { for (MatchPlayer player: this.players) { - if (!player.hasQuitted() && !player.isDoneSideboarding()) { + if (!player.hasQuit() && !player.isDoneSideboarding()) { return false; } } @@ -285,7 +285,7 @@ public abstract class MatchImpl implements Match { sb.append("- ").append(mp.getPlayer().getName()); sb.append(" (").append(mp.getWins()).append(mp.getWins()==1?" win / ":" wins / "); sb.append(mp.getLoses()).append(mp.getLoses()==1?" loss)":" losses)"); - if (mp.hasQuitted()) { + if (mp.hasQuit()) { sb.append(" QUITTED"); } sb.append("\n"); diff --git a/Mage/src/mage/game/match/MatchPlayer.java b/Mage/src/mage/game/match/MatchPlayer.java index 6f0add80b81..6830b2c6e88 100644 --- a/Mage/src/mage/game/match/MatchPlayer.java +++ b/Mage/src/mage/game/match/MatchPlayer.java @@ -42,7 +42,7 @@ public class MatchPlayer { private Deck deck; private Player player; - private boolean quitted; + private boolean quit; private boolean doneSideboarding; private int priorityTimeLeft; @@ -52,7 +52,7 @@ public class MatchPlayer { this.wins = 0; this.loses = 0; this.doneSideboarding = true; - this.quitted = false; + this.quit = false; } public int getPriorityTimeLeft() { @@ -114,11 +114,11 @@ public class MatchPlayer { return this.doneSideboarding; } - public boolean hasQuitted() { - return quitted; + public boolean hasQuit() { + return quit; } - public void setQuitted(boolean quitted) { - this.quitted = quitted; + public void setQuit(boolean quit) { + this.quit = quit; } } diff --git a/Mage/src/mage/players/Player.java b/Mage/src/mage/players/Player.java index 6332a18a4ea..007c4f23522 100644 --- a/Mage/src/mage/players/Player.java +++ b/Mage/src/mage/players/Player.java @@ -99,7 +99,7 @@ public interface Player extends MageItem, Copyable { boolean hasLost(); boolean hasWon(); - boolean hasQuitted(); + boolean hasQuit(); void quit(Game game); boolean hasLeft(); /**