From bdaf6454def5e832e1db0102e220d4051091eb83 Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Fri, 19 Jun 2020 12:54:42 +0400 Subject: [PATCH] Added commander's zone info in leave/keep message --- Mage/src/main/java/mage/game/GameImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Mage/src/main/java/mage/game/GameImpl.java b/Mage/src/main/java/mage/game/GameImpl.java index f32b53881b7..a7cdb25fdd1 100644 --- a/Mage/src/main/java/mage/game/GameImpl.java +++ b/Mage/src/main/java/mage/game/GameImpl.java @@ -1875,7 +1875,11 @@ public abstract class GameImpl implements Game, Serializable { .forEach(commanders::add); commanders.removeIf(card -> state.checkCommanderShouldStay(card, this)); for (Card card : commanders) { - if (player.chooseUse(Outcome.Benefit, "Move " + card.getIdName() + " to the command zone or leave it in its current zone?", "You can only make this choice once", "Move to command", "Leave in current zone", null, this)) { + Zone currentZone = this.getState().getZone(card.getId()); + String currentZoneInfo = (currentZone == null ? "(error)" : "(" + currentZone.name() + ")"); + if (player.chooseUse(Outcome.Benefit, "Move " + card.getIdName() + + " to the command zone or leave it in current zone " + currentZoneInfo + "?", "You can only make this choice once per object", + "Move to command", "Leave in current zone " + currentZoneInfo, null, this)) { toMove.add(card); } else { state.setCommanderShouldStay(card, this);