Merge branch 'terencehill/noclip_death_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_damage.qc

diff --git a/qcsrc/server/g_damage.qc b/qcsrc/server/g_damage.qc
index 29588f8acce1c54f4cb4bf818239385a513b5850..417275fc270fe82964b4afaa6c285371be8e0979 100644 (file)
--- a/qcsrc/server/g_damage.qc
+++ b/qcsrc/server/g_damage.qc
@@ -861,7 +861,7 @@ void Damage(entity targ, entity inflictor, entity attacker, float damage, int de
                        farcent.nextthink = time + 0.1;
                        setthink(farcent, SUB_Remove);
                }
                        farcent.nextthink = time + 0.1;
                        setthink(farcent, SUB_Remove);
                }

-               else
+               else if(targ.move_movetype != MOVETYPE_NOCLIP)

                {
                        targ.velocity = targ.velocity + farce;
                }
                {
                        targ.velocity = targ.velocity + farce;
                }