From 32d268abba60d2bfee877b7c5ee2e0d0c4e91565 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Mon, 19 Aug 2024 15:34:50 +0200
Subject: remove duplicated lobby flag. fixes lobby abort bug

---
 server/src/server.rs | 2 --
 server/src/state.rs  | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'server/src')

diff --git a/server/src/server.rs b/server/src/server.rs
index 2f93246d..43f2a59f 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -37,7 +37,6 @@ use std::{
 pub struct ServerState {
     pub data: Arc<Serverdata>,
     pub entities: Entities,
-    pub lobby: bool,
     pub player_id_counter: PlayerID,
     pub score_changed: bool,
     pub packet_loopback: VecDeque<PacketS>,
@@ -215,7 +214,6 @@ impl GameServerExt for Game {
 impl ServerState {
     pub fn new() -> Self {
         Self {
-            lobby: false,
             data: Serverdata::default().into(),
             entities: vec![],
             player_id_counter: PlayerID(1),
diff --git a/server/src/state.rs b/server/src/state.rs
index f6304db5..20a57b9d 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -185,7 +185,7 @@ impl State {
             }
         }
 
-        if server.count_chefs() <= 0 && !server.state.lobby {
+        if server.count_chefs() <= 0 && !server.game.lobby {
             self.tx
                 .send(PacketC::ServerMessage {
                     text: "Game was aborted automatically due to a lack of players".to_string(),
-- 
cgit v1.2.3-70-g09d2