From 791651a9daf9502000baab3b2587d9c4ba55aadd Mon Sep 17 00:00:00 2001 From: Adam <24621027+adoyle0@users.noreply.github.com> Date: Wed, 28 Aug 2024 23:29:56 -0400 Subject: [PATCH] fix crash --- server/src/game.rs | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/server/src/game.rs b/server/src/game.rs index e1d0387..dfc25d6 100644 --- a/server/src/game.rs +++ b/server/src/game.rs @@ -172,23 +172,21 @@ impl Game { // Move card from player's hand to judge pile for id in &trimmed { - let index = self - .players - .get(&player_user_id) - .unwrap() - .white - .iter() - .position(|card| card.uuid.to_string() == *id) - .unwrap(); // TODO: Fix unknown explosion here + if let Some(player) = self.players.get_mut(&player_user_id) { + if let Some(index) = player + .white + .iter() + .position(|card| card.uuid.to_string() == *id) + { + let card = player.white.remove(index); - let card = self - .players - .get_mut(&player_user_id) - .unwrap() // TODO: Fix explosion here when user reconnects - .white - .remove(index); - - self.judge_pile.insert(card.uuid.to_string(), card); + self.judge_pile.insert(card.uuid.to_string(), card); + } else { + tracing::error!("Judging: Can't get index"); + } + } else { + tracing::error!("Judging: Can't find player"); + } } // Meta for convenience