src/lua/client/movement.rs

@@ -54,7 +54,7 @@ pub async fn go_to(
     };
     let (goal_type, options) = if let Some(metadata) = metadata {
         (
-            metadata.get("type").unwrap_or_default(),
+            metadata.get("type")?,
             metadata.get("options").unwrap_or(lua.create_table()?),
         )
     } else {

src/lua/client/world.rs

@@ -55,32 +55,32 @@ pub async fn find_entities(
 ) -> Result<Vec<Table>> {
     let entities = {
         let mut ecs = client.ecs.lock();
-        ecs.query::<(
+        ecs.query_filtered::<(
             &AzaleaPosition,
             &CustomName,
             &EntityKind,
             &EntityUuid,
             &LookDirection,
             &MinecraftEntityId,
-            Option<&Owneruuid>,
+            &Owneruuid,
             &Pose,
-        )>()
-        .iter(&ecs)
-        .map(
-            |(position, custom_name, kind, uuid, direction, id, owner_uuid, pose)| {
-                (
-                    Vec3::from(position),
-                    custom_name.as_ref().map(ToString::to_string),
-                    kind.to_string(),
-                    uuid.to_string(),
-                    Direction::from(direction),
-                    id.0,
-                    owner_uuid.map(ToOwned::to_owned),
-                    *pose as u8,
-                )
-            },
-        )
-        .collect::<Vec<_>>()
+        ), Without<Dead>>()
+            .iter(&ecs)
+            .map(
+                |(position, custom_name, kind, uuid, direction, id, owner_uuid, pose)| {
+                    (
+                        Vec3::from(position),
+                        custom_name.as_ref().map(ToString::to_string),
+                        kind.to_string(),
+                        uuid.to_string(),
+                        Direction::from(direction),
+                        id.0,
+                        owner_uuid.to_owned(),
+                        *pose as u8,
+                    )
+                },
+            )
+            .collect::<Vec<_>>()
     };
 
     let mut matched = Vec::new();
@@ -92,9 +92,7 @@ pub async fn find_entities(
         entity.set("uuid", uuid)?;
         entity.set("direction", direction)?;
         entity.set("id", id)?;
-        if let Some(v) = owner_uuid
-            && let Some(uuid) = *v
-        {
+        if let Some(uuid) = *owner_uuid {
             entity.set("owner_uuid", uuid.to_string())?;
         }
         entity.set("pose", pose)?;