From 4c6aa708c19eb350bd6398bb3cea005a14dbae87 Mon Sep 17 00:00:00 2001 From: Rob Schnautz Date: Fri, 12 Jan 2018 17:51:14 +0000 Subject: [PATCH] Sort Conspiracy before Eldrazi --- forge-gui/src/main/java/forge/itemmanager/ColumnDef.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java index 8157d73310c..d3e75c59f3b 100644 --- a/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java +++ b/forge-gui/src/main/java/forge/itemmanager/ColumnDef.java @@ -541,7 +541,14 @@ public enum ColumnDef { //split cards last private static String toSplitLast(final InventoryItem i) { return ((IPaperCard) i).getRules().getSplitType() != CardSplitType.Split ? - "0" + toColorlessFirst(i): "1" + toSplitCardSort(i); + "0" + toConspiracyFirst(i) : "1" + toSplitCardSort(i); + } + + //conspiracy first, then everything else + private static String toConspiracyFirst(final InventoryItem i) { + return ((IPaperCard) i).getRules().getType().isConspiracy() + ? "0" //is a Conspiracy + : "1" + toColorlessFirst(i); //isn't a Conspiracy } //colorless first, then colored.