Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

UI: choose dialog improves (see 8add25fa12)

Browse source
This commit is contained in:
Oleg Agafonov 2020-01-18 09:43:25 +04:00
parent 7ca6677b93
commit f67c08ad8b
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -1973,6 +1973,7 @@ public class HumanPlayer extends PlayerImpl {
case SPLIT_AFTERMATH: case SPLIT_AFTERMATH:
MageObject object = game.getObject(ability.getSourceId()); MageObject object = game.getObject(ability.getSourceId());
if (object != null) { if (object != null) {
String message = "Choose ability to cast" + (noMana ? " for FREE" : "") + "<br>" + object.getLogName();
LinkedHashMap<UUID, ActivatedAbility> useableAbilities = getSpellAbilities(playerId, object, game.getState().getZone(object.getId()), game); LinkedHashMap<UUID, ActivatedAbility> useableAbilities = getSpellAbilities(playerId, object, game.getState().getZone(object.getId()), game);
if (useableAbilities != null if (useableAbilities != null
&& useableAbilities.size() == 1) { && useableAbilities.size() == 1) {
@ -1983,7 +1984,7 @@ public class HumanPlayer extends PlayerImpl {
updateGameStatePriority("chooseSpellAbilityForCast", game); updateGameStatePriority("chooseSpellAbilityForCast", game);
prepareForResponse(game); prepareForResponse(game);
if (!isExecutingMacro()) { if (!isExecutingMacro()) {
game.fireGetChoiceEvent(playerId, name, object, new ArrayList<>(useableAbilities.values())); game.fireGetChoiceEvent(playerId, message, object, new ArrayList<>(useableAbilities.values()));
} }
waitForResponse(game); waitForResponse(game);
@ -2014,7 +2015,6 @@ public class HumanPlayer extends PlayerImpl {
MageObject object = game.getObject(card.getId()); MageObject object = game.getObject(card.getId());
if (object != null) { if (object != null) {
String message = "Choose ability to cast" + (nonMana ? " for FREE" : "") + "<br>" + object.getLogName(); String message = "Choose ability to cast" + (nonMana ? " for FREE" : "") + "<br>" + object.getLogName();
LinkedHashMap<UUID, ActivatedAbility> useableAbilities = getSpellAbilities(playerId, object, game.getState().getZone(object.getId()), game); LinkedHashMap<UUID, ActivatedAbility> useableAbilities = getSpellAbilities(playerId, object, game.getState().getZone(object.getId()), game);
if (useableAbilities != null if (useableAbilities != null
&& useableAbilities.size() == 1) { && useableAbilities.size() == 1) {