external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

lock and invokeGameAction removed, removed input locks in PayManaBase ('cause HumanPlaySA sets these locks internally)

Browse Source
This commit is contained in:
Maxmtg
2013-05-27 15:52:13 +00:00
parent 8809a5bdb6
commit cc921eb269
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/control/input/InputCleanup.java
View File

@@ -74,7 +74,7 @@ public class InputCleanup extends InputPassPriorityBase {
if (!player.getZone(ZoneType.Hand).contains(card)) if (!player.getZone(ZoneType.Hand).contains(card))
return; return;
game.getInputQueue().lockAndInvokeGameAction(new Runnable() { game.getInputQueue().invokeGameAction(new Runnable() {
@Override @Override
public void run() { public void run() {
card.getController().discard(card, null); card.getController().discard(card, null);

4
src/main/java/forge/control/input/InputPayManaBase.java
View File

@@ -183,10 +183,10 @@ public abstract class InputPayManaBase extends InputSyncronizedBase implements I
@Override @Override
public void run() { public void run() {
HumanPlay.playSpellAbility(chosen.getActivatingPlayer(), chosen); 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 // EDT that removes lockUI from input stack will call our showMessage() method
} }

12
src/main/java/forge/control/input/InputQueue.java
View File

@@ -199,18 +199,6 @@ public class InputQueue extends MyObservable implements java.io.Serializable {
input.awaitLatchRelease(); 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) { public void invokeGameAction(final Runnable proc) {
if(FThreads.isEDT()) { if(FThreads.isEDT()) {
FThreads.invokeInNewThread(proc); FThreads.invokeInNewThread(proc);