From 277e87c244d003bee9374d71e678049c41e61e5b Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 24 Sep 2024 15:21:22 +0200
Subject: change some stuff  regarding default timer for games

---
 server/src/server.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'server/src/server.rs')

diff --git a/server/src/server.rs b/server/src/server.rs
index 9ee98b97..5efddaa1 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -336,8 +336,12 @@ impl Server {
                 load_map: &mut None,
             });
         }
-        self.game
-            .load(gamedata, &serverdata, timer, &mut self.packet_out);
+        self.game.load(
+            gamedata,
+            &serverdata,
+            timer.or(serverdata.default_timer),
+            &mut self.packet_out,
+        );
         self.gamedata_index.update(&self.game.data);
         self.data = serverdata.into();
         self.entities = entities;
@@ -697,7 +701,7 @@ impl Server {
         });
 
         if let Some(map) = load_map {
-            return Some((map, Some(Duration::from_secs(300))));
+            return Some((map, None));
         }
 
         while let Some(p) = self.packet_loopback.pop_front() {
-- 
cgit v1.2.3-70-g09d2