clippy + fmt; start using if let chains

1 files changed, 19 insertions, 22 deletions

diff --git a/server/src/server.rs b/server/src/server.rs
index 48439b5f..9141bc4e 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -461,14 +461,14 @@ impl Server {
                 // TODO if holding two, one is destroyed
                 for item in p.items.into_iter().flatten() {
                     let pos = p.movement.position.floor().as_ivec2();
-                    if let Some(tile) = self.game.tiles.get_mut(&pos) {
-                        if tile.item.is_none() {
-                            self.packet_out.push_back(PacketC::SetItem {
-                                location: ItemLocation::Tile(pos),
-                                item: Some(item.kind),
-                            });
-                            tile.item = Some(item);
-                        }
+                    if let Some(tile) = self.game.tiles.get_mut(&pos)
+                        && tile.item.is_none()
+                    {
+                        self.packet_out.push_back(PacketC::SetItem {
+                            location: ItemLocation::Tile(pos),
+                            item: Some(item.kind),
+                        });
+                        tile.item = Some(item);
                     }
                 }
                 self.packet_out
@@ -725,10 +725,10 @@ impl Server {
             self.game
                 .players_spatial_index
                 .query(pos1, 2., |p2, _pos2| {
-                    if p1 != p2 {
-                        if let [Some(a), Some(b)] = self.game.players.get_disjoint_mut([&p1, &p2]) {
-                            a.movement.collide(&mut b.movement, dt)
-                        }
+                    if p1 != p2
+                        && let [Some(a), Some(b)] = self.game.players.get_disjoint_mut([&p1, &p2])
+                    {
+                        a.movement.collide(&mut b.movement, dt)
                     }
                 })
         });
@@ -765,16 +765,13 @@ impl Server {
                     player.communicate_persist = None;
                 }
             }
-            if let Some((pos, hand)) = player.interacting {
-                if let Some(tile) = self.game.tiles.get(&pos) {
-                    if let Some(item) = &tile.item {
-                        if let Some(involvement) = &item.active {
-                            if involvement.position >= 1. {
-                                players_auto_release.push((*pid, hand));
-                            }
-                        }
-                    }
-                }
+            if let Some((pos, hand)) = player.interacting
+                && let Some(tile) = self.game.tiles.get(&pos)
+                && let Some(item) = &tile.item
+                && let Some(involvement) = &item.active
+                && involvement.position >= 1.
+            {
+                players_auto_release.push((*pid, hand));
             }
         }
         for (player, hand) in players_auto_release.drain(..) {