From 0f13b407a2a6036bb625d2cef3028eb3839a9856 Mon Sep 17 00:00:00 2001 From: Maxicarlos08 Date: Sat, 19 Aug 2023 13:29:23 +0200 Subject: [PATCH] allow for non-owned entities to teleport --- server/src/sys/teleporter.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/sys/teleporter.rs b/server/src/sys/teleporter.rs index f2765831df..39ff85beca 100644 --- a/server/src/sys/teleporter.rs +++ b/server/src/sys/teleporter.rs @@ -109,11 +109,12 @@ impl<'a> System<'a> for Sys { .join() .get(entity, &entities) }) - .filter_map(|(entity, entity_position, alignment)| { + .filter_map(|(nearby_entity, entity_position, alignment)| { (matches!(alignment, Alignment::Owned(entity_uid) if entity_uid == uid) && entity_position.0.distance_squared(position.0) - <= PET_TELEPORT_RADIUS.powi(2)) - .then_some(entity) + <= PET_TELEPORT_RADIUS.powi(2) + || entity == nearby_entity) + .then_some(nearby_entity) }); for entity in nearby {