github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 19:16:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Control player - Fixed the phase names shown to the controlled player (fixes #415).

Browse source
This commit is contained in:
LevelX2 2014-05-28 17:29:04 +02:00
parent 2b8afe379a
commit dad109b88e
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server/src/main/java/mage/server/game/GameController.java
View file

@ -672,7 +672,7 @@ public class GameController implements GameCallback {
if (controller == null) { if (controller == null) {
return; return;
} }
final String message = new StringBuilder(game.getStep().toString()).append(" - Waiting for ").append(controller.getName()).toString(); final String message = new StringBuilder(game.getStep().getType().toString()).append(" - Waiting for ").append(controller.getName()).toString();
for (final Entry<UUID, GameSession> entry: gameSessions.entrySet()) { for (final Entry<UUID, GameSession> entry: gameSessions.entrySet()) {
boolean skip = false; boolean skip = false;
for (UUID uuid : players) { for (UUID uuid : players) {

1
Mage/src/mage/game/turn/TurnMod.java
View file

@ -88,6 +88,7 @@ public class TurnMod implements Serializable {
* @param playerId * @param playerId
* @param phase * @param phase
* @param afterPhase - set to null if extraPhase is after the next phase * @param afterPhase - set to null if extraPhase is after the next phase
* @param skip
*/ */
public TurnMod(UUID playerId, TurnPhase phase, TurnPhase afterPhase, boolean skip) { public TurnMod(UUID playerId, TurnPhase phase, TurnPhase afterPhase, boolean skip) {
this.id = UUID.randomUUID(); this.id = UUID.randomUUID();