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

Merged changes from trunk to GuiRefactoring: 27198-27235 (mobile and android projects)

Browse Source
This commit is contained in:
elcnesh
2014-09-07 09:50:18 +00:00
parent 5925c35486
commit 7bc8bf6c9c
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-android/pom.xml
View File

@@ -7,7 +7,7 @@
<packaging.type>jar</packaging.type> <packaging.type>jar</packaging.type>
<build.min.memory>-Xms128m</build.min.memory> <build.min.memory>-Xms128m</build.min.memory>
<build.max.memory>-Xmx2048m</build.max.memory> <build.max.memory>-Xmx2048m</build.max.memory>
<alpha-version>1.5.26.003</alpha-version> <alpha-version>1.5.26.004</alpha-version>
</properties> </properties>
<parent> <parent>

2
forge-gui-mobile/src/forge/Forge.java
View File

@@ -37,7 +37,7 @@ import forge.util.FileUtil;
import forge.util.Utils; import forge.util.Utils;
public class Forge implements ApplicationListener { public class Forge implements ApplicationListener {
public static final String CURRENT_VERSION = "1.5.26.003"; public static final String CURRENT_VERSION = "1.5.26.004";
private static final ApplicationListener app = new Forge(); private static final ApplicationListener app = new Forge();
private static Clipboard clipboard; private static Clipboard clipboard;

3
forge-gui-mobile/src/forge/card/CardImageRenderer.java
View File

@@ -255,8 +255,7 @@ public class CardImageRenderer {
g.drawImage(image, x + (w - iconSize) / 2, y + (h - iconSize) / 2, iconSize, iconSize); g.drawImage(image, x + (w - iconSize) / 2, y + (h - iconSize) / 2, iconSize, iconSize);
} }
else { else {
if (card.getRules() == null) { return; } //this can happen with certain tokens String text = card.getOracleText();
String text = card.getRules().getOracleText();
if (StringUtils.isEmpty(text)) { return; } if (StringUtils.isEmpty(text)) { return; }
text = text.replace("\\n", "\n"); //replace new line placeholders with actual new line characters text = text.replace("\\n", "\n"); //replace new line placeholders with actual new line characters

5
forge-gui-mobile/src/forge/screens/match/FControl.java
View File

@@ -216,10 +216,7 @@ public class FControl {
Player p = getCurrentPlayer(); Player p = getCurrentPlayer();
if (p != null) { if (p != null) {
p.getController().autoPassUntil(PhaseType.CLEANUP); inputProxy.passPriority(p, PhaseType.CLEANUP);
if (!inputProxy.passPriority()) {
p.getController().autoPassCancel();
}
} }
} }