From 5e8890d8233c17fe82268c4c9872a31096c15bf0 Mon Sep 17 00:00:00 2001
From: minie4 <minie4@gmx.de>
Date: Fri, 21 Mar 2025 12:59:30 +0100
Subject: [PATCH] fix(deck-classic): automatically refill card deck

---
 backend/decks/classic.go | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/backend/decks/classic.go b/backend/decks/classic.go
index 28ef660..97f9a23 100644
--- a/backend/decks/classic.go
+++ b/backend/decks/classic.go
@@ -17,10 +17,7 @@ type Classic struct {
 
 var ClassicColors = []string{"red", "yellow", "blue", "green"}
 
-func (deck *Classic) Init(room *types.Room) {
-	deck.room = room
-	deck.DirectionReversed = false
-	deck.ActivePlayer = 0
+func (deck *Classic) fillDeck() {
 	cards := make([]*ClassicCard, 108)
 	offset := 0
 	for i := 0; i < 4; i++ {
@@ -44,6 +41,13 @@ func (deck *Classic) Init(room *types.Room) {
 	}
 	utils.ShuffleSlice(&cards)
 	deck.CardsRemaining = cards
+}
+
+func (deck *Classic) Init(room *types.Room) {
+	deck.room = room
+	deck.DirectionReversed = false
+	deck.ActivePlayer = 0
+	deck.fillDeck()
 
 	deck.room.PlayersMutex.Lock()
 	defer deck.room.PlayersMutex.Unlock()
@@ -59,7 +63,10 @@ func (deck *Classic) SetRoom(room *types.Room) {
 }
 
 func (deck *Classic) IsEmpty() bool {
-	return len(deck.CardsRemaining) == 0
+	if len(deck.CardsRemaining) == 0 {
+		deck.fillDeck()
+	}
+	return false
 }
 
 func (deck *Classic) getTopCard() *ClassicCard {
@@ -143,11 +150,7 @@ func (deck *Classic) PlayCard(card types.Card) bool {
 			amount = 4
 		}
 		for range amount {
-			card := deck.drawCard(targetPlayer)
-			if card == nil {
-				// TODO: Handle empty card deck
-				break
-			}
+			deck.drawCard(targetPlayer)
 		}
 	} else if deckCard.Symbol == "action:reverse" {
 		deck.DirectionReversed = !deck.DirectionReversed