From fa0fc14c2592de7a1bbd60b4dff2957754c5a021 Mon Sep 17 00:00:00 2001 From: Michael Kamensky Date: Fri, 12 Jan 2018 06:46:57 +0000 Subject: [PATCH] Revert "Merge branch 'patch-4' into 'master'" This reverts merge request !77 --- forge-gui/src/main/java/forge/itemmanager/ColumnDef.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java index 88bd88618db..ed8a4fcff55 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java +++ b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java @@ -68,7 +68,7 @@ public enum ColumnDef { new Function, Comparable>() { @Override public Comparable apply(final Entry from) { - return toCollectorPrefix(from.getKey()); + return toCollectorPrefix(from.getKey()) + " " + toSortableName(from.getKey().getName()); } }, new Function, Object>() { @@ -520,7 +520,7 @@ public enum ColumnDef { //this is a multi-layer sort. coding it in layers to make it easier to manipulate. private static String toCollectorPrefix(final InventoryItem i) { //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