Merge branch 'socksonme/fix_crushing_damage_crit' into 'master'

Group up extra damage from crushing attacks whenever they're crits See merge request veloren/veloren!3461
2024-08-30 18:12:32 +00:00 · 2022-07-06 21:38:41 +00:00 · 2022-07-06 21:38:41 +00:00 · c0f06dcb8a
commit c0f06dcb8a
parent 7ae65f2c13 e3b1d02fce
1 changed files with 1 additions and 1 deletions
--- a/common/src/combat.rs
+++ b/common/src/combat.rs
@ -299,7 +299,7 @@ impl Attack {
                                    by: attacker.map(|x| x.into()),
                                    cause: Some(damage.damage.source),
                                    instance: damage.instance,
-                                    crit: false,
+                                    crit: is_crit,
                                    time,
                                };
                                emit(ServerEvent::HealthChange {