mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Merge branch 'swrup/fix_melee_hit_count_increment' into 'master'
fix melee hit_count increment See merge request veloren/veloren!2574
This commit is contained in:
commit
32c2807ee0
@ -161,7 +161,7 @@ impl<'a> System<'a> for Sys {
|
|||||||
char_state: read_data.char_states.get(target),
|
char_state: read_data.char_states.get(target),
|
||||||
};
|
};
|
||||||
|
|
||||||
melee_attack.attack.apply_attack(
|
let is_applied = melee_attack.attack.apply_attack(
|
||||||
target_group,
|
target_group,
|
||||||
attacker_info,
|
attacker_info,
|
||||||
target_info,
|
target_info,
|
||||||
@ -173,7 +173,9 @@ impl<'a> System<'a> for Sys {
|
|||||||
|o| outcomes.push(o),
|
|o| outcomes.push(o),
|
||||||
);
|
);
|
||||||
|
|
||||||
melee_attack.hit_count += 1;
|
if is_applied {
|
||||||
|
melee_attack.hit_count += 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user