From 4ae49efb4a3d0bb4f39768d756b85d05a2ba9761 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Sat, 2 Mar 2013 07:50:01 +0000
Subject: [PATCH] A number of inputs recieve stop(); clause

---
 src/main/java/forge/control/input/InputBlock.java |  1 +
 .../java/forge/control/input/InputCleanup.java    |  1 +
 .../java/forge/control/input/InputControl.java    | 15 ++++++++-------
 .../java/forge/control/input/InputMulligan.java   |  3 ++-
 .../forge/control/input/InputPassPriority.java    |  1 +
 src/main/java/forge/game/ai/AiInputCommon.java    |  1 +
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/main/java/forge/control/input/InputBlock.java b/src/main/java/forge/control/input/InputBlock.java
index 108013f8e63..d28f60d2cc1 100644
--- a/src/main/java/forge/control/input/InputBlock.java
+++ b/src/main/java/forge/control/input/InputBlock.java
@@ -106,6 +106,7 @@ public class InputBlock extends Input {
             currentAttacker = null;
             allBlocking.clear();
 
+            stop();
             FControl.SINGLETON_INSTANCE.getPlayer().getController().passPriority();
         }
     }
diff --git a/src/main/java/forge/control/input/InputCleanup.java b/src/main/java/forge/control/input/InputCleanup.java
index a478cca5575..808a940efe3 100644
--- a/src/main/java/forge/control/input/InputCleanup.java
+++ b/src/main/java/forge/control/input/InputCleanup.java
@@ -59,6 +59,7 @@ public class InputCleanup extends Input {
         // goes to the next phase
         if (active.isUnlimitedHandSize() || n <= max || n <= 0 || active != turnOwner) {
             active.getController().passPriority();
+            stop();
             return;
         }
         ButtonUtil.disableAll();
diff --git a/src/main/java/forge/control/input/InputControl.java b/src/main/java/forge/control/input/InputControl.java
index 83a3def162e..652f742d907 100644
--- a/src/main/java/forge/control/input/InputControl.java
+++ b/src/main/java/forge/control/input/InputControl.java
@@ -25,7 +25,7 @@ import forge.game.phase.PhaseType;
 import forge.game.player.Player;
 import forge.game.player.PlayerController;
 import forge.game.zone.MagicStack;
-import forge.util.MyObservable;
+import forge.gui.match.controllers.CMessage;
 
 /**
  * <p>
@@ -35,7 +35,7 @@ import forge.util.MyObservable;
  * @author Forge
  * @version $Id$
  */
-public class InputControl extends MyObservable implements java.io.Serializable {
+public class InputControl implements java.io.Serializable {
     /** Constant <code>serialVersionUID=3955194449319994301L</code>. */
     private static final long serialVersionUID = 3955194449319994301L;
 
@@ -134,12 +134,13 @@ public class InputControl extends MyObservable implements java.io.Serializable {
      * @param update
      *            a boolean.
      */
-    public final void resetInput() { resetInput(true); }
-    public final void resetInput(final boolean update) {
+    public final void resetInput() { 
         this.input = null;
-        if (update) {
-            this.updateObservers();
-        }
+        this.updateObservers();
+    }
+
+    private void updateObservers() {
+        CMessage.SINGLETON_INSTANCE.getInputControl().invalidate();
     }
 
     /**
diff --git a/src/main/java/forge/control/input/InputMulligan.java b/src/main/java/forge/control/input/InputMulligan.java
index 85c82714684..ef7d36e8d7d 100644
--- a/src/main/java/forge/control/input/InputMulligan.java
+++ b/src/main/java/forge/control/input/InputMulligan.java
@@ -174,11 +174,12 @@ public class InputMulligan extends Input {
             next.initPlane();
         }
 
-        //Set Field shown to current player.        
+        //Set Field shown to current player.
         VField nextField = CMatchUI.SINGLETON_INSTANCE.getFieldViewFor(next);
         SDisplayUtil.showTab(nextField);
 
         game.getPhaseHandler().nextPhase();
+        stop();
     }
 
     @Override
diff --git a/src/main/java/forge/control/input/InputPassPriority.java b/src/main/java/forge/control/input/InputPassPriority.java
index 77ce4595bb0..80d02562045 100644
--- a/src/main/java/forge/control/input/InputPassPriority.java
+++ b/src/main/java/forge/control/input/InputPassPriority.java
@@ -75,6 +75,7 @@ public class InputPassPriority extends Input {
     @Override
     public final void selectButtonOK() {
         FControl.SINGLETON_INSTANCE.getPlayer().getController().passPriority();
+        stop();
     }
 
     /** {@inheritDoc} */
diff --git a/src/main/java/forge/game/ai/AiInputCommon.java b/src/main/java/forge/game/ai/AiInputCommon.java
index c96048e34b8..391ebad1b06 100644
--- a/src/main/java/forge/game/ai/AiInputCommon.java
+++ b/src/main/java/forge/game/ai/AiInputCommon.java
@@ -108,6 +108,7 @@ public class AiInputCommon extends Input {
             }
         }
         player.getController().passPriority();
+        stop();
     } // getMessage();
 
     /**