Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maxicarlos08/fix-pet-follow' into 'master'

Browse Source 
Fix pets not following after making them stay

See merge request veloren/veloren!4081
This commit is contained in:
Joshua Barretto 2023-08-17 10:48:31 +00:00
commit c9da8fb6a4
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/voxygen/i18n/en/gameinput.ftl
View File

@ -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

2
server/src/events/interaction.rs
View File

@ -246,7 +246,7 @@ pub fn handle_set_pet_stay(
.ecs()
.write_storage::<comp::Agent>()
.get_mut(pet)
.map(|s| s.stay_pos = current_pet_position);
.map(|s| s.stay_pos = current_pet_position.filter(|_| stay));
}
}