adam/cards
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

prevent crash when submitting empty judge request

Browse source
This commit is contained in:
Adam 2024-08-28 18:13:02 -04:00
parent 1b6452cad0
commit 574471fbfb
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/src/game.rs
View file

@ -142,13 +142,11 @@ impl Game {
pub fn judge_round(&mut self, request: JudgeDecisionRequest, player_user_id: String) { pub fn judge_round(&mut self, request: JudgeDecisionRequest, player_user_id: String) {
// Check if player is czar // Check if player is czar
if self.czar.read().unwrap().uuid.to_string() == player_user_id { if self.czar.read().unwrap().uuid.to_string() == player_user_id {
let winner_id = self if let Some(winner_id) = self.judge_pile_meta.get(&request.winning_cards) {
.judge_pile_meta self.end_round(winner_id.to_string())
.get(&request.winning_cards) } else {
.unwrap() tracing::error!("Attempted to look up nonexistent cards for judging!");
.clone(); }
self.end_round(winner_id)
} else { } else {
tracing::error!("Player is not czar!"); tracing::error!("Player is not czar!");
} }

14
server/src/message_handler.rs
View file

@ -80,11 +80,15 @@ impl MessageHandler {
_judge_decision _judge_decision
if let Ok(judge_request) = from_str::<JudgeDecisionRequest>(&text) => if let Ok(judge_request) = from_str::<JudgeDecisionRequest>(&text) =>
{ {
self.state if !judge_request.winning_cards.is_empty() {
.games_tx self.state
.send(JudgeDecision(judge_request, addr)) .games_tx
.await .send(JudgeDecision(judge_request, addr))
.unwrap(); .await
.unwrap();
} else {
tracing::debug!("Judge request received with empty cards");
}
} }
_delete_game if let Ok(delete_request) = from_str::<GameDeleteRequest>(&text) => { _delete_game if let Ok(delete_request) = from_str::<GameDeleteRequest>(&text) => {