]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix frozen players not dying/respawning if they touch a hurt trigger
authorMario <mario.mario@y7mail.com>
Thu, 18 Apr 2013 10:06:57 +0000 (20:06 +1000)
committerMario <mario.mario@y7mail.com>
Thu, 18 Apr 2013 10:06:57 +0000 (20:06 +1000)
qcsrc/server/g_damage.qc

index 75401b0dd374e70abe805314f18ee81d5769a4ce..2f25e5d2d2baa9f4385523238c6567b85fee4eee 100644 (file)
@@ -810,7 +810,7 @@ void Damage (entity targ, entity inflictor, entity attacker, float damage, float
                        mirrorforce *= g_weaponforcefactor;
                }
                
-               if(targ.frozen && attacker.monsterid != MONSTER_SPIDER)
+               if(targ.frozen && attacker.monsterid != MONSTER_SPIDER && deathtype != DEATH_HURTTRIGGER)
                {
                        damage = 0;
                        force *= 0.2;