From 8b06b68c21e6c16d3d2cdbbcc96a1a2057fe4327 Mon Sep 17 00:00:00 2001 From: cypress Date: Sat, 15 Jun 2024 14:17:42 -0700 Subject: [PATCH] SERVER: Explicitly play Player Damage on affected client --- source/server/damage.qc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/server/damage.qc b/source/server/damage.qc index 7d8d91e..47a31ae 100644 --- a/source/server/damage.qc +++ b/source/server/damage.qc @@ -455,9 +455,9 @@ void(entity attacker, float d_style) DieHandler = } } -void(entity victim,entity attacker, float damage, float d_style) DamageHandler = { +void(entity victim, entity attacker, float damage, float d_style) DamageHandler = { // don't do any attacking during nuke delay - if (d_style == S_ZOMBIE && nuke_powerup_active > time) + if (d_style == S_NORMAL && nuke_powerup_active > time) return; entity old_self; @@ -529,9 +529,9 @@ void(entity victim,entity attacker, float damage, float d_style) DamageHandler = // Play pain noise if this isn't done by an electric barrier. if (d_style != S_ZAPPER) - sound (self, CHAN_AUTO, "sounds/player/pain4.wav", 1, ATTN_NORM); + sound (victim, CHAN_AUTO, "sounds/player/pain4.wav", 1, ATTN_NORM); else - sound (self, CHAN_AUTO, "sounds/machines/elec_shock.wav", 1, ATTN_NORM); + sound (victim, CHAN_AUTO, "sounds/machines/elec_shock.wav", 1, ATTN_NORM); if (victim.sprinting) { old_self = self;