X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_shotgun.qc;h=635b1ccf8b959ac753e4f06ef493605e9049b973;hb=ae649f8d11948e44f459ddf51f0d4709eff5b50c;hp=38ae17a24f579e6ef4ea2d05a849f4a812e3dd1f;hpb=e485fd25f90166cbd4a258456a7bd66540536608;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 38ae17a24..635b1ccf8 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 && autocvar_g_balance_shotgun_secondary_melee_no_doubleslap)) // missed or owner died, remove ent
 		remove(self);
 	else // continue swinging the weapon in hope of hitting someone :)
 		self.nextthink = time;