From: Mario <mario@smbclan.net>
Date: Sat, 27 Feb 2016 06:08:47 +0000 (+1000)
Subject: Prevent picking up nades while frozen
X-Git-Tag: xonotic-v0.8.2~1176
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=70c98c8fc07e690bc81574f328822e9ce19dac98;p=xonotic%2Fxonotic-data.pk3dir.git

Prevent picking up nades while frozen
---

diff --git a/qcsrc/common/mutators/mutator/nades/nades.qc b/qcsrc/common/mutators/mutator/nades/nades.qc
index 720a8f0e8..b54ee9176 100644
--- a/qcsrc/common/mutators/mutator/nades/nades.qc
+++ b/qcsrc/common/mutators/mutator/nades/nades.qc
@@ -696,6 +696,7 @@ void nade_touch()
 	if(autocvar_g_nades_pickup)
 	if(time >= self.spawnshieldtime)
 	if(!other.nade && self.health == self.max_health) // no boosted shot pickups, thank you very much
+	if(!other.frozen)
 	if(CanThrowNade(other)) // prevent some obvious things, like dead players
 	if(IS_REAL_CLIENT(other)) // above checks for IS_PLAYER, don't need to do it here
 	{