clippy; make use of is_some_and and is_none_or

2 files changed, 7 insertions, 7 deletions

diff --git a/server/src/interaction.rs b/server/src/interaction.rs
index 5a8372ee..fef1ca40 100644
--- a/server/src/interaction.rs
+++ b/server/src/interaction.rs
@@ -168,11 +168,11 @@ pub fn interact(
         }
     }
 
-    let can_place = tile.map_or(true, |tile| {
-        other.as_ref().map_or(false, |other| {
+    let can_place = tile.is_none_or(|tile| {
+        other.as_ref().is_some_and(|other| {
             data.tile_placeable_items
                 .get(&tile)
-                .map_or(true, |pl| pl.contains(&other.kind))
+                .is_none_or(|pl| pl.contains(&other.kind))
         })
     });
 
diff --git a/server/src/server.rs b/server/src/server.rs
index 363afc7b..e16fdb61 100644
--- a/server/src/server.rs
+++ b/server/src/server.rs
@@ -169,7 +169,7 @@ impl GameServerExt for Game {
     fn prime_client(&self) -> Vec<PacketC> {
         let mut out = Vec::new();
         out.push(PacketC::Data {
-            data: self.data.as_ref().to_owned(),
+            data: Box::new(self.data.as_ref().to_owned()),
         });
         out.push(PacketC::Environment {
             effects: self.environment_effects.clone(),
@@ -549,13 +549,13 @@ impl Server {
                 player.interacting = if edge { Some((pos, hand)) } else { None };
 
                 // Dont try interacting with player it tile is interactable
-                let other_pid = if !self
+                let other_pid = if self
                     .game
                     .data
                     .tile_placeable_items
                     .get(&tile.kind)
-                    .map_or(false, |p| !p.is_empty())
-                // TODO check for hand item
+                    // TODO check for hand item
+                    .is_none_or(|p| p.is_empty())
                 {
                     self.game
                         .players