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

Merge remote-tracking branch 'upstream/master' into fix-deck-editor-custom-editions-image-view

Browse Source
This commit is contained in:
leriomaggio
2021-05-31 09:12:32 +01:00
parent 62961889d5 51924d16db
commit 03d6687c64
86 changed files with 1020 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
forge-core/src/main/java/forge/card/CardEdition.java
View File

@@ -194,10 +194,15 @@ public final class CardEdition implements Comparable<CardEdition> { // immutable
} catch (NumberFormatException ex) {
String nonNumeric = sortableCollNr.replaceAll("[0-9]", "");
String onlyNumeric = sortableCollNr.replaceAll("[^0-9]", "");
if (sortableCollNr.startsWith(onlyNumeric)) // e.g. 12a, 37+, 2018f,
sortableCollNr = String.format("%05d", Integer.parseInt(onlyNumeric)) + nonNumeric;
try {
collNr = Integer.parseInt(onlyNumeric);
} catch (NumberFormatException exon) {
collNr = 0; // this is the case of ONLY-letters collector numbers
}
if ((collNr > 0) && (sortableCollNr.startsWith(onlyNumeric))) // e.g. 12a, 37+, 2018f,
sortableCollNr = String.format("%05d", collNr) + nonNumeric;
else // e.g. WS6, S1
sortableCollNr = nonNumeric + String.format("%05d", Integer.parseInt(onlyNumeric));
sortableCollNr = nonNumeric + String.format("%05d", collNr);
}
return sortableCollNr;
}