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

Merge branch 'master' of https://git.cardforge.org/core-developers/forge into ui-card-translation

Browse Source
This commit is contained in:
Peter
2019-08-06 08:46:45 +02:00
parent 3e2c9ad162 413de957a8
commit 720a3966c1
21 changed files with 55 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-gui/src/main/java/forge/itemmanager/ColumnDef.java
View File

@@ -35,6 +35,8 @@ import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.Map.Entry;
import org.apache.commons.lang3.StringUtils;
public enum ColumnDef {
/**The column containing the inventory item name.*/
STRING("", "", 0, false, SortState.ASC,
@@ -512,7 +514,8 @@ public enum ColumnDef {
result = ((IPaperCard) i).getRules().getIntPower();
if (result == Integer.MAX_VALUE) {
if (((IPaperCard)i).getRules().getType().isPlaneswalker()) {
result = ((IPaperCard) i).getRules().getInitialLoyalty();
String loy = ((IPaperCard) i).getRules().getInitialLoyalty();
result = StringUtils.isNumeric(loy) ? Integer.valueOf(loy) : 0;
}
}
}