From: Mario <mario.mario@y7mail.com>
Date: Fri, 12 Jul 2013 04:07:21 +0000 (+1000)
Subject: Fix nade timer getting reset if it's shot while on the ground
X-Git-Tag: xonotic-v0.8.0~366^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8836239a434369fd66c33b2bb571c7f3e0dc4a0f;p=xonotic%2Fxonotic-data.pk3dir.git

Fix nade timer getting reset if it's shot while on the ground
---

diff --git a/qcsrc/server/mutators/mutator_nades.qc b/qcsrc/server/mutators/mutator_nades.qc
index c2db6322f..7b5bb12c6 100644
--- a/qcsrc/server/mutators/mutator_nades.qc
+++ b/qcsrc/server/mutators/mutator_nades.qc
@@ -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)