From: FruitieX <fruitiex@gmail.com>
Date: Fri, 15 Apr 2011 18:07:38 +0000 (+0300)
Subject: stop the slap if player dies! Why did I not do this before >:(
X-Git-Tag: xonotic-v0.5.0~264^2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7cf9f367116b7448db8950acf156b1a020748e06;p=xonotic%2Fxonotic-data.pk3dir.git

stop the slap if player dies! Why did I not do this before >:(
---

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 38ae17a24..adcb7db4d 100644
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -77,7 +77,7 @@ void shotgun_meleethink (void)
 		Damage (trace_ent, self.owner, self.owner, autocvar_g_balance_shotgun_secondary_damage * min(1, f + 1), WEP_SHOTGUN | HITTYPE_SECONDARY , self.owner.origin + self.owner.view_ofs, force);
 		remove(self);
 	}
-	else if(time >= self.cnt + meleetime) // missed, remove ent
+	else if(time >= self.cnt + meleetime || self.owner.deadflag != DEAD_NO) // missed or owner died, remove ent
 		remove(self);
 	else // continue swinging the weapon in hope of hitting someone :)
 		self.nextthink = time;