From c1a11dd89a9302c53d036c7d99e9f19f3f4a4322 Mon Sep 17 00:00:00 2001
From: Maxmtg <maxmtg@cardforge.org>
Date: Wed, 29 Jan 2014 06:49:48 +0000
Subject: [PATCH] natural ordering of cards now includes art idnex

---
 forge-core/src/main/java/forge/item/PaperCard.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/forge-core/src/main/java/forge/item/PaperCard.java b/forge-core/src/main/java/forge/item/PaperCard.java
index 50faeb151aa..f954e5aaab5 100644
--- a/forge-core/src/main/java/forge/item/PaperCard.java
+++ b/forge-core/src/main/java/forge/item/PaperCard.java
@@ -184,6 +184,10 @@ public final class PaperCard implements Comparable<IPaperCard>, InventoryItemFro
             return nameCmp;
         }
         // TODO compare sets properly
-        return this.edition.compareTo(o.getEdition());
+        int setDiff = this.edition.compareTo(o.getEdition());
+        if ( 0 != setDiff )
+            return setDiff;
+        
+        return Integer.compare(artIndex, o.getArtIndex());
     }
 }