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

- Unfortunately, have to revert r34731 - breaks mobile Forge (at least when running on desktop, e.g. for debugging purposes, but quite possibly on Android itself as well) and does not allow to cast anything from hand at all, making the single click on a card function as a selection (but not allowing to actually cast the spell).

Browse Source
This commit is contained in:
Agetian
2017-07-13 20:08:47 +00:00
parent 03f636a726
commit ea4f8b67f2
3 changed files with 11 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
forge-game/src/main/java/forge/game/GameAction.java
View File

@@ -17,7 +17,6 @@
*/
package forge.game;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Iterables;
@@ -77,7 +76,6 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.Callable;
/**
* Methods for common actions performed during a game.
@@ -1746,17 +1744,8 @@ public class GameAction {
// state effects are checked only when someone gets priority
}
private Function<Runnable, Void> invokeFunction;
public synchronized void setInvokeFunction(Function<Runnable, Void> invokeFunction) {
this.invokeFunction = invokeFunction;
}
// Invokes given runnable on the Game thread - used to start game and perform actions from UI when waiting for input.
public synchronized void invoke(final Runnable proc) {
if (invokeFunction != null) {
invokeFunction.apply(proc);
return;
}
// Invokes given runnable in Game thread pool - used to start game and perform actions from UI (when game-0 waits for input)
public void invoke(final Runnable proc) {
if (ThreadUtil.isGameThread()) {
proc.run();
}