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

Merge branch 'revert-72e78226' into 'master'

Browse Source 
Revert "Merge branch 'patch-4' into 'master'"

See merge request core-developers/forge!81
This commit is contained in:
Michael Kamensky
2018-01-12 06:48:03 +00:00
parent 36d6342e77 fa0fc14c25
commit 3d11422191
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ public enum ColumnDef {
new Function<Entry<InventoryItem, Integer>, Comparable<?>>() { new Function<Entry<InventoryItem, Integer>, Comparable<?>>() {
@Override @Override
public Comparable<?> apply(final Entry<InventoryItem, Integer> from) { public Comparable<?> apply(final Entry<InventoryItem, Integer> from) {
return toCollectorPrefix(from.getKey()); return toCollectorPrefix(from.getKey()) + " " + toSortableName(from.getKey().getName());
} }
}, },
new Function<Entry<? extends InventoryItem, Integer>, Object>() { new Function<Entry<? extends InventoryItem, Integer>, Object>() {
@@ -520,7 +520,7 @@ public enum ColumnDef {
//this is a multi-layer sort. coding it in layers to make it easier to manipulate. //this is a multi-layer sort. coding it in layers to make it easier to manipulate.
private static String toCollectorPrefix(final InventoryItem i) { private static String toCollectorPrefix(final InventoryItem i) {
//make sure it's a card. if not, pointless to proceed. //make sure it's a card. if not, pointless to proceed.
return (i instanceof PaperCard ? ((IPaperCard) i).getCollectorIndex() + " ": "") + toSortableName(i.getName()); return i instanceof PaperCard ? toBasicLandsLast(i) : "";
} }
//lands after other cards //lands after other cards