From ac04c17995779b0af2db30c24f2044f1ccd3272f Mon Sep 17 00:00:00 2001 From: Maxmtg Date: Mon, 27 May 2013 17:21:15 +0000 Subject: [PATCH] title added to InputBlock update added to inputP --- src/main/java/forge/control/input/InputBlock.java | 9 ++++----- src/main/java/forge/control/input/InputPayManaBase.java | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/forge/control/input/InputBlock.java b/src/main/java/forge/control/input/InputBlock.java index 23f1b4306b5..f374369924d 100644 --- a/src/main/java/forge/control/input/InputBlock.java +++ b/src/main/java/forge/control/input/InputBlock.java @@ -60,19 +60,18 @@ public class InputBlock extends InputPassPriorityBase { /** {@inheritDoc} */ @Override - public final void showMessage() { + protected final void showMessage() { // could add "Reset Blockers" button ButtonUtil.enableOnlyOk(); + final StringBuilder sb = new StringBuilder(); + sb.append(player.getName() + ", declare blockers.\n\n"); if (this.currentAttacker == null) { - - final StringBuilder sb = new StringBuilder(); - sb.append("To Block, click on your Opponents attacker first, then your blocker(s). "); + sb.append("To Block, click on your opponent's attacker first, then your blocker(s).\n"); sb.append("To cancel a block right-click on your blocker"); showMessage(sb.toString()); } else { final String attackerName = this.currentAttacker.isFaceDown() ? "Morph" : this.currentAttacker.getName(); - final StringBuilder sb = new StringBuilder(); sb.append("Select a creature to block ").append(attackerName).append(" ("); sb.append(this.currentAttacker.getUniqueNumber()).append("). "); sb.append("To cancel a block right-click on your blocker"); diff --git a/src/main/java/forge/control/input/InputPayManaBase.java b/src/main/java/forge/control/input/InputPayManaBase.java index 557d8d3bbeb..1038f8abf4b 100644 --- a/src/main/java/forge/control/input/InputPayManaBase.java +++ b/src/main/java/forge/control/input/InputPayManaBase.java @@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils; import forge.Card; import forge.CardUtil; +import forge.FThreads; import forge.card.ColorSet; import forge.card.MagicColor; import forge.card.ability.ApiType; @@ -184,10 +185,10 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I public void run() { HumanPlay.playSpellAbility(chosen.getActivatingPlayer(), chosen); onManaAbilityPlayed(chosen); + FThreads.invokeInEdtLater(new Runnable() { @Override public void run() { showMessage(); } }); } }; game.getInputQueue().invokeGameAction(proc); - // EDT that removes lockUI from input stack will call our showMessage() method }