Fix drawn card being revealed during ability resolve

forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java

@@ -356,11 +356,9 @@ public abstract class InputPayMana extends InputSyncronizedBase {
                         player.getManaPool().payManaFromAbility(saPaidFor, InputPayMana.this.manaCost, chosen);
                     }
                     onManaAbilityPaid();
-                    onStateChanged();
-                } else {
-                    // Need to call this to unlock
-                    onStateChanged();
                 }
+                // Need to call this to unlock
+                onStateChanged();
             }
         });
 

forge-gui/src/main/java/forge/gamemodes/match/input/InputSyncronizedBase.java

@@ -36,6 +36,8 @@ public abstract class InputSyncronizedBase extends InputBase implements InputSyn
     }
 
     protected final void stop() {
+        onStop();
+
         // ensure input won't accept any user actions.
         FThreads.invokeInEdtNowOrLater(new Runnable() {
             @Override
@@ -44,8 +46,6 @@ public abstract class InputSyncronizedBase extends InputBase implements InputSyn
             }
         });
 
-        onStop();
-
         // thread irrelevant
         if (getController().getInputQueue().getInput() != null) {
             getController().getInputQueue().removeInput(InputSyncronizedBase.this);

forge-gui/src/main/java/forge/player/HumanPlaySpellAbility.java

@@ -171,7 +171,7 @@ public class HumanPlaySpellAbility {
                 manapool.restoreColorReplacements();
                 human.decNumManaConversion();
             }
-            game.clearTopLibsCast();
+            game.clearTopLibsCast(ability);
             return false;
         }
 
@@ -197,7 +197,7 @@ public class HumanPlaySpellAbility {
                 manapool.restoreColorReplacements();
             }
         }
-        game.clearTopLibsCast();
+        game.clearTopLibsCast(ability);
         return true;
     }