diff --git a/src/main/java/hepia/Deck.java b/src/main/java/hepia/Deck.java index 43e4a9031763b4df7a8db51a2efbbfcf99bfaf3d..41089894591a11ce623f39487eff3e380b2f26c3 100644 --- a/src/main/java/hepia/Deck.java +++ b/src/main/java/hepia/Deck.java @@ -184,8 +184,12 @@ public class Deck { int lhs = Arrays.asList(Card.getRANK_NAMES()).indexOf(name1[0]); int rhs = Arrays.asList(Card.getRANK_NAMES()).indexOf(name2[0]); + int diff_rank = lhs - rhs; - return lhs - rhs; + if (diff_rank != 0) { + return diff_rank; + } + return o1.getSuit().compareTo(o2.getSuit()); } }); }