save remaining chunks in memory

pumpkin-world/src/level.rs

@@ -97,7 +97,14 @@ impl Level {
         log::info!("Saving level...");
 
         // chunks are automatically saved when all players get removed
-        // TODO: Await this ^
+        // TODO: Await chunks that have been called by this ^
+
+        // save all stragling chunks
+        for chunk in self.loaded_chunks.iter() {
+            let pos = chunk.key();
+            let chunk = chunk.value();
+            self.write_chunk((*pos, chunk.clone())).await;
+        }
 
         // then lets save the world info
         self.world_info_writer

pumpkin/src/server/mod.rs

@@ -112,10 +112,8 @@ impl Server {
         );
 
         // Spawn chunks are never unloaded
-        for x in -1..=1 {
-            for z in -1..=1 {
-                world.level.mark_chunk_as_newly_watched(Vector2::new(x, z));
-            }
+        for chunk in Self::spawn_chunks() {
+            world.level.mark_chunk_as_newly_watched(chunk);
         }
 
         Self {
@@ -144,6 +142,14 @@ impl Server {
         }
     }
 
+    const SPAWN_CHUNK_RADIUS: i32 = 1;
+
+    pub fn spawn_chunks() -> impl Iterator<Item = Vector2<i32>> {
+        (-Self::SPAWN_CHUNK_RADIUS..=Self::SPAWN_CHUNK_RADIUS).flat_map(|x| {
+            (-Self::SPAWN_CHUNK_RADIUS..=Self::SPAWN_CHUNK_RADIUS).map(move |z| Vector2::new(x, z))
+        })
+    }
+
     /// Adds a new player to the server.
     ///
     /// This function takes an `Arc<Client>` representing the connected client and performs the following actions: