politician doesnt shut down entire server

Author: ItsSammyM

server/src/game/phase.rs

@@ -124,7 +124,11 @@ impl PhaseState {
             ChatMessageVariant::PhaseChange { 
                 phase: game.current_phase().clone(),
                 //need this if statement because the day number should be increased for obituary phase
-                day_number: if game.current_phase().phase() != PhaseType::Obituary {game.phase_machine.day_number} else {game.phase_machine.day_number+1}
+                day_number: if game.current_phase().phase() != PhaseType::Obituary {
+                    game.phase_machine.day_number
+                } else {
+                    game.phase_machine.day_number.saturating_add(1)
+                }
             }
         );
 
@@ -147,7 +151,7 @@ impl PhaseState {
 
                 events.into_iter().for_each(|f| f.invoke(game));
 
-                game.phase_machine.day_number += 1;
+                game.phase_machine.day_number = game.phase_machine.day_number.saturating_add(1);
             },
             PhaseState::Nomination { trials_left, nomination_time_remaining } => {
                 game.phase_machine.set_time_remaining(nomination_time_remaining);

server/src/game/role/politician.rs

@@ -1,5 +1,3 @@
-use std::time::Duration;
-
 use serde::Serialize;
 
 use crate::game::attack_power::DefensePower;
@@ -104,14 +102,15 @@ impl RoleStateImpl for Politician {
 
         if self.state.countdown_started() && actor_ref.alive(game) {
             //for skipping phases
-            match phase {
-                PhaseType::Briefing | PhaseType::Nomination | PhaseType::Testimony | 
-                PhaseType::Judgement | PhaseType::FinalWords | PhaseType::Recess => {}
+            // this litterally causes the entire server to crash
+            // match phase {
+            //     PhaseType::Briefing | PhaseType::Nomination | PhaseType::Testimony | 
+            //     PhaseType::Judgement | PhaseType::FinalWords | PhaseType::Recess => {}
 
-                PhaseType::Obituary | PhaseType::Discussion | PhaseType::Dusk | PhaseType::Night => {
-                    game.phase_machine.time_remaining = Duration::from_secs(0);
-                }
-            }
+            //     PhaseType::Obituary | PhaseType::Discussion | PhaseType::Dusk | PhaseType::Night => {
+            //         game.phase_machine.time_remaining = Duration::from_secs(0);
+            //     }
+            // }
 
             match phase {
                 PhaseType::Nomination => {
@@ -125,6 +124,7 @@ impl RoleStateImpl for Politician {
                 },
                 _ => {}
             }
+
         }
     }
 
@@ -192,9 +192,10 @@ impl Politician {
     fn start_countdown(&mut self, game: &mut Game){
         game.add_message_to_chat_group(ChatGroup::All, ChatMessageVariant::PoliticianCountdownStarted);
 
-        if game.current_phase().phase() != PhaseType::Nomination {
-            game.phase_machine.time_remaining = Duration::from_secs(0);
-        }
+        // causes the entire server to crash
+        // if game.current_phase().phase() != PhaseType::Nomination {
+        //     game.phase_machine.time_remaining = Duration::from_secs(0);
+        // }
         self.state = PoliticianState::CountdownStarted;
     }