diff --git a/src/main/java/forge/control/input/InputCleanup.java b/src/main/java/forge/control/input/InputCleanup.java index 181fad1bea3..b4863bf14ef 100644 --- a/src/main/java/forge/control/input/InputCleanup.java +++ b/src/main/java/forge/control/input/InputCleanup.java @@ -74,7 +74,7 @@ public class InputCleanup extends InputPassPriorityBase { if (!player.getZone(ZoneType.Hand).contains(card)) return; - game.getInputQueue().lockAndInvokeGameAction(new Runnable() { + game.getInputQueue().invokeGameAction(new Runnable() { @Override public void run() { card.getController().discard(card, null); diff --git a/src/main/java/forge/control/input/InputPayManaBase.java b/src/main/java/forge/control/input/InputPayManaBase.java index 03cf50646ff..557d8d3bbeb 100644 --- a/src/main/java/forge/control/input/InputPayManaBase.java +++ b/src/main/java/forge/control/input/InputPayManaBase.java @@ -183,10 +183,10 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I @Override public void run() { HumanPlay.playSpellAbility(chosen.getActivatingPlayer(), chosen); - onManaAbilityPlayed(chosen); + onManaAbilityPlayed(chosen); } }; - game.getInputQueue().lockAndInvokeGameAction(proc); + game.getInputQueue().invokeGameAction(proc); // EDT that removes lockUI from input stack will call our showMessage() method } diff --git a/src/main/java/forge/control/input/InputQueue.java b/src/main/java/forge/control/input/InputQueue.java index 30b9c493a2b..dff985f1443 100644 --- a/src/main/java/forge/control/input/InputQueue.java +++ b/src/main/java/forge/control/input/InputQueue.java @@ -199,18 +199,6 @@ public class InputQueue extends MyObservable implements java.io.Serializable { input.awaitLatchRelease(); } - public void lockAndInvokeGameAction(final Runnable proc) { - Runnable toRun = new Runnable() { - @Override - public void run() { - InputQueue.this.lock(); - proc.run(); - InputQueue.this.unlock(); - } - }; - invokeGameAction(toRun); - } - public void invokeGameAction(final Runnable proc) { if(FThreads.isEDT()) { FThreads.invokeInNewThread(proc);