1 files changed, 7 insertions, 3 deletions
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() {