diff --git a/src/main/java/edu/ntnu/stud/cardgame/DeckOfCards.java b/src/main/java/edu/ntnu/stud/cardgame/DeckOfCards.java index 3d2816aa81fd9c74f15e3e652fcf00b805b046df..87f3ce0907e19761292b5daaf343de953d466ac8 100644 --- a/src/main/java/edu/ntnu/stud/cardgame/DeckOfCards.java +++ b/src/main/java/edu/ntnu/stud/cardgame/DeckOfCards.java @@ -24,20 +24,20 @@ public class DeckOfCards { return deck; } - public Collection<PlayingCard> dealHand(int n) { + public HandOfCards dealHand(int n) { if (n < 0 || n > deck.size()) { throw new IllegalArgumentException("Invalid number of cards to deal"); } - Collection<PlayingCard> hand = new ArrayList<>(); + HandOfCards hand = new HandOfCards(); for (int i = 0; i < n; i++) { int cardIndex = random.nextInt(deck.size()); - if (hand.contains(deck.get(cardIndex))) { + if (hand.getHand().contains(deck.get(cardIndex))) { i--; } else { - hand.add(deck.remove(cardIndex)); + hand.addCard(deck.get(cardIndex)); } } - return hand; + return hand; } @Override