From ded8afc0afdb849f663d4e725b7a5ebcd29566ad Mon Sep 17 00:00:00 2001
From: Scott <scottld@stud.ntnu.no>
Date: Tue, 27 Feb 2024 18:56:21 +0100
Subject: [PATCH] Added HandOfCard class to follow good practises
---
src/main/java/edu/ntnu/stud/cardgame/DeckOfCards.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/edu/ntnu/stud/cardgame/DeckOfCards.java b/src/main/java/edu/ntnu/stud/cardgame/DeckOfCards.java
index 3d2816a..87f3ce0 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
--
GitLab