6 files changed, 31 insertions, 48 deletions
diff --git a/server/editor/src/main.rs b/server/editor/src/main.rs
index 0f0dcab3..5d2c06ea 100644
--- a/server/editor/src/main.rs
+++ b/server/editor/src/main.rs
@@ -141,15 +141,13 @@ async fn handle_conn(
         minor: VERSION.1,
         supports_bincode: false,
     });
-    state.out.push(PacketC::GameData {
-        data: 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::GameData(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/lib.rs b/server/game-core/src/lib.rs
index ed6faf5b..faecb9d1 100644
--- a/server/game-core/src/lib.rs
+++ b/server/game-core/src/lib.rs
@@ -88,8 +88,8 @@ pub struct Game {
 impl Game {
     pub fn apply_packet(&mut self, packet: PacketC) {
         match packet {
-            PacketC::GameData { data } => {
-                self.data = Arc::new(*data);
+            PacketC::GameData(data) => {
+                self.data = Arc::new(data);
             }
             PacketC::AddPlayer {
                 id,
diff --git a/server/protocol/src/lib.rs b/server/protocol/src/lib.rs
index db69f6be..f90dd351 100644
--- a/server/protocol/src/lib.rs
+++ b/server/protocol/src/lib.rs
@@ -221,12 +221,8 @@ pub enum PacketC {
     Joined {
         id: PlayerID,
     },
-    ServerData {
-        data: Box<Serverdata>,
-    },
-    GameData {
-        data: Box<Gamedata>,
-    },
+    ServerData(Serverdata),
+    GameData(Gamedata),
     AddPlayer {
         id: PlayerID,
         position: Vec2,
diff --git a/server/registry/src/lobby.rs b/server/registry/src/lobby.rs
index eb6ae1f0..44f18ad3 100644
--- a/server/registry/src/lobby.rs
+++ b/server/registry/src/lobby.rs
@@ -75,23 +75,19 @@ async fn handle_conn(sock: TcpStream, addr: SocketAddr, entries: &[Entry]) -> Re
         minor: VERSION.1,
         supports_bincode: false,
     });
-    out.push(PacketC::ServerData {
-        data: Box::new(Serverdata {
-            bot_algos: vec![],
-            maps: vec![],
-            motd: None,
-            name: "Registry".to_string(),
-        }),
-    });
-    out.push(PacketC::GameData {
-        data: 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()
-        }),
-    });
+    out.push(PacketC::ServerData(Serverdata {
+        bot_algos: vec![],
+        maps: vec![],
+        motd: None,
+        name: "Registry".to_string(),
+    }));
+    out.push(PacketC::GameData(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/server.rs b/server/src/server.rs
index 795192c5..69ef89fe 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -228,14 +228,12 @@ impl GameServerExt for Game {
 
     fn prime_client(&self) -> Vec<PacketC> {
         let mut out = Vec::new();
-        out.push(PacketC::GameData {
-            data: {
-                let mut k = self.data.as_ref().to_owned();
-                k.recipes.clear();
-                k.demands.clear();
-                Box::new(k)
-            },
-        });
+        out.push(PacketC::GameData({
+            let mut k = self.data.as_ref().to_owned();
+            k.recipes.clear();
+            k.demands.clear();
+            k
+        }));
         out.push(PacketC::Environment {
             effects: self.environment_effects.clone(),
         });
diff --git a/server/src/state.rs b/server/src/state.rs
index 533c5a0c..83d04d16 100644
--- a/server/src/state.rs
+++ b/server/src/state.rs
@@ -128,12 +128,7 @@ impl Server {
                 supports_bincode: true,
             },
         );
-        init.insert(
-            1,
-            PacketC::ServerData {
-                data: self.data.clone(),
-            },
-        );
+        init.insert(1, PacketC::ServerData(*self.data.clone()));
         self.connections.insert(
             id,
             ConnectionData {