]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix nade timer getting reset if it's shot while on the ground
authorMario <mario.mario@y7mail.com>
Fri, 12 Jul 2013 04:07:21 +0000 (14:07 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 12 Jul 2013 04:07:21 +0000 (14:07 +1000)
qcsrc/server/mutators/mutator_nades.qc

index c2db6322f8506ba4f5543adc56edc8b2cb8c9d92..7b5bb12c63e126df3f0455b87a6fcfd8c5a40327 100644 (file)
@@ -124,7 +124,7 @@ void nade_damage(entity inflictor, entity attacker, float damage, float deathtyp
        
        self.velocity += force;
 
-       if(!damage)
+       if(!damage || self.flags & FL_ONGROUND)
                return;
 
        if(self.health == self.max_health)