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

feat(client): pass entity pose in find_entities

Browse Source
This commit is contained in:
Ryan 2025-02-22 15:24:36 -05:00
parent 3a93bb9e33
commit 4e64bc6ac4
Signed by: ErrorNoInternet
GPG Key ID: 2486BFB7B1E6A4A3
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,7 +5,7 @@ use azalea::{
blocks::{BlockState, BlockStates}, blocks::{BlockState, BlockStates},
ecs::query::Without, ecs::query::Without,
entity::{ entity::{
Dead, EntityKind, EntityUuid, LookDirection, Position as AzaleaPosition, Dead, EntityKind, EntityUuid, LookDirection, Pose, Position as AzaleaPosition,
metadata::CustomName, metadata::CustomName,
}, },
world::{InstanceName, MinecraftEntityId}, world::{InstanceName, MinecraftEntityId},
@ -56,19 +56,21 @@ pub fn find_entities(lua: &Lua, client: &Client, filter_fn: Function) -> Result<
&MinecraftEntityId, &MinecraftEntityId,
&EntityUuid, &EntityUuid,
&EntityKind, &EntityKind,
&CustomName,
&AzaleaPosition, &AzaleaPosition,
&LookDirection, &LookDirection,
&CustomName, &Pose,
), Without<Dead>>(); ), Without<Dead>>();
for (&id, uuid, kind, position, direction, custom_name) in query.iter(&ecs) { for (&id, uuid, kind, custom_name, position, direction, pose) in query.iter(&ecs) {
let entity = lua.create_table()?; let entity = lua.create_table()?;
entity.set("id", id.0)?; entity.set("id", id.0)?;
entity.set("uuid", uuid.to_string())?; entity.set("uuid", uuid.to_string())?;
entity.set("kind", kind.to_string())?; entity.set("kind", kind.to_string())?;
entity.set("custom_name", custom_name.as_ref().map(ToString::to_string))?;
entity.set("position", Vec3::from(position))?; entity.set("position", Vec3::from(position))?;
entity.set("direction", Direction::from(direction))?; entity.set("direction", Direction::from(direction))?;
entity.set("custom_name", custom_name.as_ref().map(ToString::to_string))?; entity.set("pose", *pose as u8)?;
if filter_fn.call::<bool>(&entity)? { if filter_fn.call::<bool>(&entity)? {
matched.push(entity); matched.push(entity);