From dad109b88e2eedd5e0dd17fd8ba62b67911b1bec Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 28 May 2014 17:29:04 +0200 Subject: [PATCH] * Control player - Fixed the phase names shown to the controlled player (fixes #415). --- Mage.Server/src/main/java/mage/server/game/GameController.java | 2 +- Mage/src/mage/game/turn/TurnMod.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Mage.Server/src/main/java/mage/server/game/GameController.java b/Mage.Server/src/main/java/mage/server/game/GameController.java index f15aeab748..6b1aed1a6b 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -672,7 +672,7 @@ public class GameController implements GameCallback { if (controller == null) { 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 entry: gameSessions.entrySet()) { boolean skip = false; for (UUID uuid : players) { diff --git a/Mage/src/mage/game/turn/TurnMod.java b/Mage/src/mage/game/turn/TurnMod.java index 687fd517b0..cecef0ee0f 100644 --- a/Mage/src/mage/game/turn/TurnMod.java +++ b/Mage/src/mage/game/turn/TurnMod.java @@ -88,6 +88,7 @@ public class TurnMod implements Serializable { * @param playerId * @param 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) { this.id = UUID.randomUUID();