From b145e1ad0e1b5ef4993a8d5c1bc92a33c815af68 Mon Sep 17 00:00:00 2001
From: ice_iix <ice_ix@protonmail.ch>
Date: Fri, 18 Jun 2021 17:58:32 -0700
Subject: [PATCH] Fix clippy::branches_sharing_code in chunk loading

---
 src/world/mod.rs | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/src/world/mod.rs b/src/world/mod.rs
index 18dc262..6a98873 100644
--- a/src/world/mod.rs
+++ b/src/world/mod.rs
@@ -661,15 +661,12 @@ impl World {
 
         let cpos = CPos(x, z);
         {
-            let chunk = if new {
+            if new {
                 self.chunks.insert(cpos, Chunk::new(cpos));
-                self.chunks.get_mut(&cpos).unwrap()
-            } else {
-                if !self.chunks.contains_key(&cpos) {
-                    return Ok(());
-                }
-                self.chunks.get_mut(&cpos).unwrap()
-            };
+            } else if !self.chunks.contains_key(&cpos) {
+                return Ok(());
+            }
+            let chunk = self.chunks.get_mut(&cpos).unwrap();
 
             for i in 0..16 {
                 if chunk.sections[i].is_none() {
@@ -816,15 +813,12 @@ impl World {
     ) -> Result<(), protocol::Error> {
         let cpos = CPos(x, z);
         {
-            let chunk = if new {
+            if new {
                 self.chunks.insert(cpos, Chunk::new(cpos));
-                self.chunks.get_mut(&cpos).unwrap()
-            } else {
-                if !self.chunks.contains_key(&cpos) {
-                    return Ok(());
-                }
-                self.chunks.get_mut(&cpos).unwrap()
-            };
+            } else if !self.chunks.contains_key(&cpos) {
+                return Ok(());
+            }
+            let chunk = self.chunks.get_mut(&cpos).unwrap();
 
             // Block type array - whole byte per block
             let mut block_types = [[0u8; 4096]; 16];
@@ -1015,15 +1009,12 @@ impl World {
 
         let cpos = CPos(x, z);
         {
-            let chunk = if new {
+            if new {
                 self.chunks.insert(cpos, Chunk::new(cpos));
-                self.chunks.get_mut(&cpos).unwrap()
-            } else {
-                if !self.chunks.contains_key(&cpos) {
-                    return Ok(());
-                }
-                self.chunks.get_mut(&cpos).unwrap()
-            };
+            } else if !self.chunks.contains_key(&cpos) {
+                return Ok(());
+            }
+            let chunk = self.chunks.get_mut(&cpos).unwrap();
 
             for i in 0..16 {
                 if chunk.sections[i].is_none() {