ErrorNoInternet/ErrorNoWatcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(client/world): wrap Owneruuid in Option

Browse Source
This commit is contained in:
Ryan 2025-03-01 16:32:59 -05:00
parent 89091a3fd5
commit 04f5e0e8c2
Signed by: ErrorNoInternet
GPG Key ID: 2486BFB7B1E6A4A3
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lua/client/world.rs
View File

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