From 351feb5a99d1d7bbef2f2588332ab0a85c765d88 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 17 Aug 2017 00:36:59 +0200 Subject: [PATCH 1/2] * Fixed that at match start if a player chooses who starts, the idle check was not started. --- .../src/main/java/mage/server/game/GameController.java | 9 +++++++++ 1 file changed, 9 insertions(+) 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 366404cff6a..6ea79cf2bc0 100644 --- a/Mage.Server/src/main/java/mage/server/game/GameController.java +++ b/Mage.Server/src/main/java/mage/server/game/GameController.java @@ -317,8 +317,17 @@ public class GameController implements GameCallback { for (final Entry entry : gameSessions.entrySet()) { entry.getValue().init(); } + GameWorker worker = new GameWorker(game, choosingPlayerId, this); gameFuture = gameExecutor.submit(worker); + try { + Thread.sleep(1000); + } catch (InterruptedException ex) { + } + if (game.getState().getChoosingPlayerId() != null) { + // start timer to force player to choose starting player otherwise loosing by being idle + setupTimeout(game.getState().getChoosingPlayerId()); + } } } From 2b8737b026ccb198c5e68b9ecbf9ca1b9230f069 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 17 Aug 2017 01:11:03 +0200 Subject: [PATCH 2/2] * Fixed text of planeswalker to keep to only include type not name. --- Mage/src/main/java/mage/game/GameImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index 7f4f936bba3..4cbe21e3e8f 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -1948,7 +1948,7 @@ public abstract class GameImpl implements Game, Serializable { Player controller = this.getPlayer(planeswalker.getControllerId()); if (controller != null) { Target targetPlaneswalkerToKeep = new TargetPermanent(filterPlaneswalker); - targetPlaneswalkerToKeep.setTargetName(planeswalker.getName() + " to keep?"); + targetPlaneswalkerToKeep.setTargetName(planeswalkertype.toString() + " to keep?"); controller.chooseTarget(Outcome.Benefit, targetPlaneswalkerToKeep, null, this); for (Permanent dupPlaneswalker : this.getBattlefield().getActivePermanents(filterPlaneswalker, planeswalker.getControllerId(), this)) { if (!targetPlaneswalkerToKeep.getTargets().contains(dupPlaneswalker.getId())) {