make set_block_state return an Option

azalea-world/src/chunk_storage.rs

@@ -80,22 +80,21 @@ impl ChunkStorage {
 
     pub fn get_block_state(&self, pos: &BlockPos, min_y: i32) -> Option<BlockState> {
         let chunk_pos = ChunkPos::from(pos);
-        let chunk = &self[&chunk_pos];
+        let chunk = self[&chunk_pos].as_ref()?;
-        chunk
+        let chunk = chunk.lock().unwrap();
-            .as_ref()
+        Some(chunk.get(&ChunkBlockPos::from(pos), min_y))
-            .map(|chunk| chunk.lock().unwrap().get(&ChunkBlockPos::from(pos), min_y))
     }
 
-    pub fn set_block_state(&self, pos: &BlockPos, state: BlockState, min_y: i32) -> BlockState {
+    pub fn set_block_state(
+        &self,
+        pos: &BlockPos,
+        state: BlockState,
+        min_y: i32,
+    ) -> Option<BlockState> {
         let chunk_pos = ChunkPos::from(pos);
-        let chunk = &self[&chunk_pos];
+        let chunk = self[&chunk_pos].as_ref()?;
-        if let Some(chunk) = chunk.as_ref() {
+        let mut chunk = chunk.lock().unwrap();
-            let mut chunk = chunk.lock().unwrap();
+        Some(chunk.get_and_set(&ChunkBlockPos::from(pos), state, min_y))
-            chunk.get_and_set(&ChunkBlockPos::from(pos), state, min_y)
-        } else {
-            // nothing is in this chunk, just return air
-            BlockState::Air
-        }
     }
 
     pub fn replace_with_packet_data(

azalea-world/src/lib.rs

@@ -60,7 +60,7 @@ impl Dimension {
         self.chunk_storage.get_block_state(pos, self.min_y())
     }
 
-    pub fn set_block_state(&mut self, pos: &BlockPos, state: BlockState) -> BlockState {
+    pub fn set_block_state(&mut self, pos: &BlockPos, state: BlockState) -> Option<BlockState> {
         self.chunk_storage.set_block_state(pos, state, self.min_y())
     }