dkforest

commit 3b934525b92960287d661ade381d4ae421181f21
parent 90caa0462b477c17469206fb1cf09dff27cc4429
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Fri,  8 Dec 2023 04:58:23 -0500

cleanup

Diffstat:
M
pkg/web/handlers/poker/poker.go
 | 
23
+++++++++++++----------

1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -138,6 +138,18 @@ type GameResult struct {
 }
 
 func (g *Ongoing) computeWinners() (winner []GameResult) {
+	countAlive := 0
+	var lastAlive *PokerPlayer
+	for _, p := range g.Players {
+		if !p.Folded {
+			countAlive++
+			lastAlive = p
+		}
+	}
+	if countAlive == 1 {
+		return []GameResult{{-1, []*PokerPlayer{lastAlive}}}
+	}
+
 	m := make(map[int32][]*PokerPlayer)
 	for _, p := range g.Players {
 		if p.Folded {
@@ -713,18 +725,9 @@ func dealerThread(db *database.DkfDB, g *PokerGame, roomID string) {
 	// Show cards
 	showCards(g, roomTopic, seats)
 
-	winners = g.Ongoing.computeWinners()
-
 END:
 
-	if len(winners) == 0 {
-		for _, p := range g.Ongoing.Players {
-			if !p.Folded {
-				winners = append(winners, GameResult{HandScore: -1, Players: []*PokerPlayer{p}})
-				break
-			}
-		}
-	}
+	winners = g.Ongoing.computeWinners()
 
 	mainPot := int(g.Ongoing.MainPot.Load())