clippy

9 files changed, 24 insertions, 28 deletions

diff --git a/server/data/src/lib.rs b/server/data/src/lib.rs
index 53b4e802..d09c3ca3 100644
--- a/server/data/src/lib.rs
+++ b/server/data/src/lib.rs
@@ -356,11 +356,10 @@ fn tiles_flagged(
     let mut out = HashSet::new();
     for (i, tile) in tiles.iter().enumerate() {
         let (kind, _params) = tile.split_once(":").unwrap_or((tile, ""));
-        if let Some(flags) = tile_flags.get(kind) {
-            if flags.contains(flag) {
+        if let Some(flags) = tile_flags.get(kind)
+            && flags.contains(flag) {
                 out.insert(TileIndex(i));
             }
-        }
     }
     out
 }
diff --git a/server/editor/src/main.rs b/server/editor/src/main.rs
index 5d2c06ea..4074463a 100644
--- a/server/editor/src/main.rs
+++ b/server/editor/src/main.rs
@@ -141,13 +141,13 @@ async fn handle_conn(
         minor: VERSION.1,
         supports_bincode: false,
     });
-    state.out.push(PacketC::GameData(Gamedata {
+    state.out.push(PacketC::GameData(Box::new(Gamedata {
         tile_collide: (0..TILES.len()).map(TileIndex).collect(),
         tile_placeable_items: BTreeMap::new(),
         tile_names: TILES.iter().map(|(name, _, _)| name.to_string()).collect(),
         current_map: "editor".to_owned(),
         ..Default::default()
-    }));
+    })));
     state.out.push(PacketC::SetIngame {
         state: true,
         lobby: false, // very ironic
diff --git a/server/game-core/src/interaction.rs b/server/game-core/src/interaction.rs
index e80fd8d6..e49487c6 100644
--- a/server/game-core/src/interaction.rs
+++ b/server/game-core/src/interaction.rs
@@ -246,7 +246,7 @@ impl Game {
                 other_slot.as_ref().is_some_and(|other| {
                     self.data
                         .tile_placeable_items
-                        .get(&tile)
+                        .get(tile)
                         .is_none_or(|pl| pl.contains(&other.kind))
                 })
             });
diff --git a/server/game-core/src/lib.rs b/server/game-core/src/lib.rs
index 21315a07..df48c323 100644
--- a/server/game-core/src/lib.rs
+++ b/server/game-core/src/lib.rs
@@ -89,7 +89,7 @@ impl Game {
     pub fn apply_packet(&mut self, packet: PacketC) {
         match packet {
             PacketC::GameData(data) => {
-                self.data = Arc::new(data);
+                self.data = Arc::new(*data);
             }
             PacketC::AddPlayer {
                 id,
@@ -323,7 +323,7 @@ impl Game {
             let mut k = self.data.as_ref().to_owned();
             k.recipes.clear();
             k.demands.clear();
-            k
+            Box::new(k)
         }));
         out.push(PacketC::Environment {
             effects: self.environment_effects.clone(),
diff --git a/server/protocol/src/lib.rs b/server/protocol/src/lib.rs
index f90dd351..a276a29a 100644
--- a/server/protocol/src/lib.rs
+++ b/server/protocol/src/lib.rs
@@ -221,8 +221,8 @@ pub enum PacketC {
     Joined {
         id: PlayerID,
     },
-    ServerData(Serverdata),
-    GameData(Gamedata),
+    ServerData(Box<Serverdata>),
+    GameData(Box<Gamedata>),
     AddPlayer {
         id: PlayerID,
         position: Vec2,
diff --git a/server/registry/src/lobby.rs b/server/registry/src/lobby.rs
index 44f18ad3..f60d36c9 100644
--- a/server/registry/src/lobby.rs
+++ b/server/registry/src/lobby.rs
@@ -75,19 +75,19 @@ async fn handle_conn(sock: TcpStream, addr: SocketAddr, entries: &[Entry]) -> Re
         minor: VERSION.1,
         supports_bincode: false,
     });
-    out.push(PacketC::ServerData(Serverdata {
+    out.push(PacketC::ServerData(Box::new(Serverdata {
         bot_algos: vec![],
         maps: vec![],
         motd: None,
         name: "Registry".to_string(),
-    }));
-    out.push(PacketC::GameData(Gamedata {
+    })));
+    out.push(PacketC::GameData(Box::new(Gamedata {
         tile_collide: (0..TILES.len()).map(TileIndex).collect(),
         tile_placeable_items: BTreeMap::new(),
         tile_names: TILES.iter().map(|(s, _)| s.to_string()).collect(),
         current_map: "registry".to_owned(),
         ..Default::default()
-    }));
+    })));
     let walkable = HashSet::from_iter(
         tiles
             .iter()
diff --git a/server/src/entity/ctf_minigame.rs b/server/src/entity/ctf_minigame.rs
index f56e5648..c975821d 100644
--- a/server/src/entity/ctf_minigame.rs
+++ b/server/src/entity/ctf_minigame.rs
@@ -70,7 +70,7 @@ impl CtfMinigame {
     }
 
     fn setup(&mut self, c: &mut EntityContext) -> Result<(), TrError> {
-        let mut players = c.game.players.iter_mut().map(|p| p);
+        let mut players = c.game.players.iter_mut();
         'a: loop {
             for (_, data) in self.teams.iter_mut() {
                 if let Some((&pid, player)) = players.next() {
@@ -92,7 +92,7 @@ impl CtfMinigame {
         Ok(*self
             .teams
             .iter_mut()
-            .find(|(_, d)| d.players.get(&pid).is_some())
+            .find(|(_, d)| d.players.contains(&pid))
             .ok_or(TrError::Plain("Player is not in any team".to_string()))?
             .0)
     }
@@ -130,7 +130,7 @@ impl CtfMinigame {
         let (_, team) = self
             .teams
             .iter()
-            .find(|(_, d)| d.players.get(&pid).is_some())
+            .find(|(_, d)| d.players.contains(&pid))
             .ok_or(TrError::Plain("Player is not in any team".to_string()))?;
         c.game
             .players
@@ -169,17 +169,17 @@ impl CtfMinigame {
         for (item, _) in ti.clone() {
             write!(o, "{:<20}|", c.game.data.item_name(*item)).unwrap();
         }
-        writeln!(o, "").unwrap();
+        writeln!(o).unwrap();
         write!(o, "|").unwrap();
         for (_, (s, _)) in ti.clone() {
             write!(o, "{:<20}|", s).unwrap();
         }
-        writeln!(o, "").unwrap();
+        writeln!(o).unwrap();
         write!(o, "|").unwrap();
         for _ in ti.clone() {
             write!(o, "{:-<20}|", "").unwrap();
         }
-        writeln!(o, "").unwrap();
+        writeln!(o).unwrap();
         let max = self
             .teams
             .iter()
@@ -197,7 +197,7 @@ impl CtfMinigame {
                     write!(o, "{:<20}|", "").unwrap();
                 }
             }
-            writeln!(o, "").unwrap();
+            writeln!(o).unwrap();
         }
         c.packet_out.push_back(PacketC::ServerMessage {
             error: false,
@@ -213,7 +213,7 @@ impl Entity for CtfMinigame {
             self.setup(&mut c)?;
         }
         for (_, team) in self.teams.iter_mut() {
-            team.players.retain(|pid| c.game.players.get(pid).is_some());
+            team.players.retain(|pid| c.game.players.contains_key(pid));
         }
         self.time += c.dt;
         while self.time > 0. {
@@ -249,8 +249,7 @@ impl Entity for CtfMinigame {
                                 .items
                                 .iter()
                                 .flatten()
-                                .find(|i| i.kind != from_team_idx)
-                                .is_some()
+                                .any(|i| i.kind != from_team_idx)
                                 && c.game
                                     .tiles
                                     .get(&pos)
diff --git a/server/src/server.rs b/server/src/server.rs
index efa3fba3..b3cd2922 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -550,11 +550,9 @@ impl Server {
                 .query(pos1, 2., |p2, _pos2| {
                     if p1 != p2
                         && let [Some(a), Some(b)] = self.game.players.get_disjoint_mut([&p1, &p2])
-                    {
-                        if a.movement.collide(&mut b.movement, dt) {
+                        && a.movement.collide(&mut b.movement, dt) {
                             a.movement_input_changed = true;
                         }
-                    }
                 })
         });
 
diff --git a/server/src/state.rs b/server/src/state.rs
index 04458aea..aa46f47c 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -128,7 +128,7 @@ impl Server {
                 supports_bincode: true,
             },
         );
-        init.insert(1, PacketC::ServerData(*self.data.clone()));
+        init.insert(1, PacketC::ServerData(Box::new(*self.data.clone())));
         self.connections.insert(
             id,
             ConnectionData {