From 7e12fa253aab8752961fdf0f2cfa84b81286038c Mon Sep 17 00:00:00 2001 From: Oliver-Akins Date: Tue, 26 Jan 2021 16:12:55 -0700 Subject: [PATCH] Protect against attempting to draw 0 cards --- server/src/events/SendCard.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/server/src/events/SendCard.ts b/server/src/events/SendCard.ts index 6b040d7..380c5b6 100644 --- a/server/src/events/SendCard.ts +++ b/server/src/events/SendCard.ts @@ -24,9 +24,14 @@ export default (io: Server, socket: Socket, data: SendCard) => { // Draw new cards for team deck.discard(data.text); - team.addCardsToHand(game.questions.draw(conf.game.hand_size - team.hand.length)); team.selectQuestion(data.text); + // Get any additional cards needed + let needed_cards = conf.game.hand_size - team.hand.length; + if (needed_cards > 0) { + team.addCardsToHand(game.questions.draw(needed_cards)); + }; + socket.emit(`UpdateHand`, { status: 200, mode: "replace",