Merge branch 'sam/sceptre-fix' into 'master'

Sceptre fix

See merge request veloren/veloren!1468
This commit is contained in:
Samuel Keiffer 2020-10-31 19:05:31 +00:00
commit 34c3bab6ad

View File

@ -180,7 +180,7 @@ impl<'a> System<'a> for Sys {
let change = damage.modify_damage(block, loadouts.get(b), beam_segment.owner);
if matches!(damage, Damage::Healing(_)) {
if !matches!(damage, Damage::Healing(_)) {
server_emitter.emit(ServerEvent::Damage {
uid: *uid_b,
change,