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 'swrup/fix_combo_decay_on_death' into 'master'

Browse Source 
fix combo not reset at respawn

See merge request veloren/veloren!2553
This commit is contained in:
Samuel Keiffer 2021-07-05 03:56:24 +00:00
commit dcdf1c83a3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/src/events/entity_manipulation.rs
View File

@ -662,6 +662,11 @@ pub fn handle_respawn(server: &Server, entity: EcsEntity) {
.write_storage::<comp::Health>() .write_storage::<comp::Health>()
.get_mut(entity) .get_mut(entity)
.map(|mut health| health.revive()); .map(|mut health| health.revive());
state
.ecs()
.write_storage::<comp::Combo>()
.get_mut(entity)
.map(|mut combo| combo.reset());
state state
.ecs() .ecs()
.write_storage::<comp::Pos>() .write_storage::<comp::Pos>()