From ce8be9596b40b23e2f0def4ddeaabf993ba967f4 Mon Sep 17 00:00:00 2001 From: Maxicarlos08 Date: Thu, 17 Aug 2023 11:53:24 +0200 Subject: [PATCH] fix pets not following after making them stay and translation --- assets/voxygen/i18n/en/gameinput.ftl | 2 +- server/src/events/interaction.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/voxygen/i18n/en/gameinput.ftl b/assets/voxygen/i18n/en/gameinput.ftl index 55eade661a..8c6527660b 100644 --- a/assets/voxygen/i18n/en/gameinput.ftl +++ b/assets/voxygen/i18n/en/gameinput.ftl @@ -33,7 +33,7 @@ gameinput-climbdown = Climb Down gameinput-wallleap = Wall Leap gameinput-togglelantern = Toggle Lantern gameinput-mount = Mount -gameinput-stay = Stay/Follow +gameinput-stayfollow = Stay/Follow gameinput-chat = Chat gameinput-command = Command gameinput-escape = Escape diff --git a/server/src/events/interaction.rs b/server/src/events/interaction.rs index 9741c958af..af268697cb 100755 --- a/server/src/events/interaction.rs +++ b/server/src/events/interaction.rs @@ -246,7 +246,7 @@ pub fn handle_set_pet_stay( .ecs() .write_storage::() .get_mut(pet) - .map(|s| s.stay_pos = current_pet_position); + .map(|s| s.stay_pos = current_pet_position.filter(|_| stay)); } }