X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_damage.qc;h=4840e15dd25d6916239fb221de8fbd721d47cec0;hb=07c7a1ca162187cc9d8c8d4d2e05eddd0873ce92;hp=28a1c8e8ca23e760a6d5a966899747be9be04ceb;hpb=88e2b104926cf3d356cfdf2cd3598f7d743a1a35;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 28a1c8e8c..4840e15dd 100644
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -910,7 +910,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
 	// apply push
 	if (self.damageforcescale)
 	if (vlen(force))
-	if (!IS_PLAYER(self) || time >= self.spawnshieldtime)
+	if (!IS_PLAYER(self) || time >= self.spawnshieldtime || self == attacker)
 	{
 		vector farce = damage_explosion_calcpush(self.damageforcescale * force, self.velocity, autocvar_g_balance_damagepush_speedfactor);
 		if(self.movetype == MOVETYPE_PHYSICS)