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

renamed createIngamePlayer method to minimize confusion

Browse Source
This commit is contained in:
Maxmtg
2014-01-13 06:23:32 +00:00
parent 4cb27c40ac
commit ce341302a3
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/src/main/java/forge/game/Game.java
View File

@@ -98,7 +98,7 @@ public class Game {
roIngamePlayers = Collections.unmodifiableList(ingamePlayers); roIngamePlayers = Collections.unmodifiableList(ingamePlayers);
for (RegisteredPlayer psc : players0) { for (RegisteredPlayer psc : players0) {
Player pl = psc.getPlayer().getPlayer(this); Player pl = psc.getPlayer().createIngamePlayer(this);
players.add(pl); players.add(pl);
ingamePlayers.add(pl); ingamePlayers.add(pl);

2
forge-gui/src/main/java/forge/game/player/LobbyPlayer.java
View File

@@ -84,7 +84,7 @@ public abstract class LobbyPlayer implements IHasIcon {
this.avatarIndex = avatarIndex; this.avatarIndex = avatarIndex;
} }
public abstract Player getPlayer(Game gameState); // factory method to create player public abstract Player createIngamePlayer(Game gameState); // factory method to create player
public abstract PlayerController createControllerFor(Player p); public abstract PlayerController createControllerFor(Player p);
public abstract void hear(LobbyPlayer player, String message); public abstract void hear(LobbyPlayer player, String message);

2
forge-gui/src/main/java/forge/game/player/LobbyPlayerAi.java
View File

@@ -31,7 +31,7 @@ public class LobbyPlayerAi extends LobbyPlayer {
} }
@Override @Override
public Player getPlayer(Game game) { public Player createIngamePlayer(Game game) {
Player ai = new Player(getName(), game); Player ai = new Player(getName(), game);
ai.setFirstController(createControllerFor(ai)); ai.setFirstController(createControllerFor(ai));

2
forge-gui/src/main/java/forge/game/player/LobbyPlayerRemote.java
View File

@@ -22,7 +22,7 @@ public class LobbyPlayerRemote extends LobbyPlayer {
* @see forge.game.player.LobbyPlayer#getPlayer(forge.game.GameState) * @see forge.game.player.LobbyPlayer#getPlayer(forge.game.GameState)
*/ */
@Override @Override
public Player getPlayer(Game gameState) { public Player createIngamePlayer(Game gameState) {
// Cannot create remote players yet // Cannot create remote players yet
throw new UnsupportedOperationException("method is not implemented"); throw new UnsupportedOperationException("method is not implemented");
} }

2
forge-gui/src/main/java/forge/gui/player/LobbyPlayerHuman.java
View File

@@ -26,7 +26,7 @@ public class LobbyPlayerHuman extends LobbyPlayer {
} }
@Override @Override
public Player getPlayer(Game game) { public Player createIngamePlayer(Game game) {
Player player = new Player(GuiDisplayUtil.personalizeHuman(getName()), game); Player player = new Player(GuiDisplayUtil.personalizeHuman(getName()), game);
player.setFirstController(new PlayerControllerHuman(game, player, this)); player.setFirstController(new PlayerControllerHuman(game, player, this));

2
forge-gui/src/test/java/forge/gamesimulationtests/util/LobbyPlayerForTests.java
View File

@@ -33,7 +33,7 @@ public class LobbyPlayerForTests extends LobbyPlayer {
} }
@Override @Override
public Player getPlayer( Game gameState ) { public Player createIngamePlayer( Game gameState ) {
Player dummyPlayer = new Player( getName(), gameState ); Player dummyPlayer = new Player( getName(), gameState );
dummyPlayer.setFirstController( createControllerFor( dummyPlayer ) ); dummyPlayer.setFirstController( createControllerFor( dummyPlayer ) );
return dummyPlayer; return dummyPlayer;