diff options
Diffstat (limited to 'azalea-client/src')
| -rw-r--r-- | azalea-client/src/plugins/packet/game/mod.rs | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/azalea-client/src/plugins/packet/game/mod.rs b/azalea-client/src/plugins/packet/game/mod.rs index 7b2fa8b7..8c573ade 100644 --- a/azalea-client/src/plugins/packet/game/mod.rs +++ b/azalea-client/src/plugins/packet/game/mod.rs @@ -1549,26 +1549,18 @@ impl GamePacketHandler<'_> { pub fn entity_position_sync(&mut self, p: &ClientboundEntityPositionSync) { as_system::<( Commands, + Query<(&EntityIdIndex, &WorldHolder)>, Query<( - &EntityIdIndex, - &WorldHolder, - Option<&LocalEntity>, &mut Physics, &mut Position, &mut LookDirection, + Option<&LocalEntity>, )>, EntityUpdateQuery, )>( self.ecs, - |(mut commands, mut query, entity_update_query)| { - let ( - entity_id_index, - world_holder, - local_entity, - mut physics, - mut position, - mut look_direction, - ) = query.get_mut(self.player).unwrap(); + |(mut commands, mut query, mut entity_query, entity_update_query)| { + let (entity_id_index, world_holder) = query.get_mut(self.player).unwrap(); let Some(entity) = entity_id_index.get_by_minecraft_entity(p.id) else { debug!("Got teleport entity packet for unknown entity id {}", p.id); @@ -1587,6 +1579,12 @@ impl GamePacketHandler<'_> { ) { return; } + + let Ok((mut physics, mut position, mut look_direction, local_entity)) = + entity_query.get_mut(entity) + else { + return; + }; let is_local_entity = local_entity.is_some(); physics.vec_delta_codec.set_base(new_position); |