remove nesting in game/server data packets

2 files changed, 7 insertions, 14 deletions

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 {