dkforest

commit e4b60285297a9a4d1bc3f83083b824b34c899176
parent 5b9fe1d0dab445ea390f8efdf3a63f0efb3b9f2e
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Thu,  7 Dec 2023 04:42:19 -0500

cleanup

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

1 file changed, 22 insertions(+), 24 deletions(-)
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -641,30 +641,28 @@ func dealerThread(db *database.DkfDB, g *PokerGame, roomID string) {
 	}
 
 	for _, p := range g.Ongoing.Players {
-		if p != nil {
-
-			p.CardsMtx.RLock()
-			playerCard1 := p.Cards[0].Name
-			playerCard2 := p.Cards[1].Name
-			p.CardsMtx.RUnlock()
 
-			hand := []poker.Card{
-				poker.NewCard(cardToPokerCard(g.Ongoing.CommunityCards[0])),
-				poker.NewCard(cardToPokerCard(g.Ongoing.CommunityCards[1])),
-				poker.NewCard(cardToPokerCard(g.Ongoing.CommunityCards[2])),
-				poker.NewCard(cardToPokerCard(g.Ongoing.CommunityCards[3])),
-				poker.NewCard(cardToPokerCard(g.Ongoing.CommunityCards[4])),
-				poker.NewCard(cardToPokerCard(playerCard1)),
-				poker.NewCard(cardToPokerCard(playerCard2)),
-			}
-			e := poker.Evaluate(hand)
-			// TODO: handle split pot
-			// TODO: handle all-in side pots
-			if e < minScore {
-				winner = p
-				minScore = e
-				winnerHand = poker.RankString(e)
-			}
+		p.CardsMtx.RLock()
+		playerCard1 := p.Cards[0].Name
+		playerCard2 := p.Cards[1].Name
+		p.CardsMtx.RUnlock()
+
+		hand := []poker.Card{
+			poker.NewCard(cardToPokerCard(g.Ongoing.CommunityCards[0])),
+			poker.NewCard(cardToPokerCard(g.Ongoing.CommunityCards[1])),
+			poker.NewCard(cardToPokerCard(g.Ongoing.CommunityCards[2])),
+			poker.NewCard(cardToPokerCard(g.Ongoing.CommunityCards[3])),
+			poker.NewCard(cardToPokerCard(g.Ongoing.CommunityCards[4])),
+			poker.NewCard(cardToPokerCard(playerCard1)),
+			poker.NewCard(cardToPokerCard(playerCard2)),
+		}
+		e := poker.Evaluate(hand)
+		// TODO: handle split pot
+		// TODO: handle all-in side pots
+		if e < minScore {
+			winner = p
+			minScore = e
+			winnerHand = poker.RankString(e)
 		}
 	}
 
@@ -672,7 +670,7 @@ END:
 
 	if winner == nil {
 		for _, p := range g.Ongoing.Players {
-			if p != nil && !p.Folded {
+			if !p.Folded {
 				winner = p
 				winnerHand = "Only player alive"
 				break