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

- Reverted several Java 8 functions to their Java 7 counterparts for Android compatibility.

Browse Source
This commit is contained in:
Agetian
2017-07-25 03:12:04 +00:00
parent 8e9c76a9e8
commit f9e987e933
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -359,7 +359,7 @@ public class AbilityUtils {
if (StringUtils.isNumeric(amount)) { if (StringUtils.isNumeric(amount)) {
int val = Integer.parseInt(amount); int val = Integer.parseInt(amount);
if (maxto) { if (maxto) {
val = Integer.max(val, 0); val = Math.max(val, 0);
} }
return val * multiplier; return val * multiplier;
} }
@@ -399,7 +399,7 @@ public class AbilityUtils {
if (StringUtils.isNumeric(svarval)) { if (StringUtils.isNumeric(svarval)) {
int val = Integer.parseInt(svarval); int val = Integer.parseInt(svarval);
if (maxto) { if (maxto) {
val = Integer.max(val, 0); val = Math.max(val, 0);
} }
return val * multiplier; return val * multiplier;
} }
@@ -472,7 +472,7 @@ public class AbilityUtils {
if (val != null) { if (val != null) {
if (maxto) { if (maxto) {
val = Integer.max(val, 0); val = Math.max(val, 0);
} }
return val * multiplier; return val * multiplier;
} }

2
forge-gui/src/main/java/forge/limited/BoosterDraft.java
View File

@@ -151,7 +151,7 @@ public class BoosterDraft implements IBoosterDraft {
if (myDrafts.isEmpty()) { if (myDrafts.isEmpty()) {
SOptionPane.showMessageDialog("No custom draft files found."); SOptionPane.showMessageDialog("No custom draft files found.");
} else { } else {
myDrafts.sort(new Comparator<CustomLimited>() { Collections.sort(myDrafts, new Comparator<CustomLimited>() {
@Override @Override
public int compare(CustomLimited o1, CustomLimited o2) { public int compare(CustomLimited o1, CustomLimited o2) {
return o1.getName().compareTo(o2.getName()); return o1.getName().compareTo(o2.getName());