]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Prevent picking up nades while frozen
authorMario <mario@smbclan.net>
Sat, 27 Feb 2016 06:08:47 +0000 (16:08 +1000)
committerMario <mario@smbclan.net>
Sat, 27 Feb 2016 06:08:47 +0000 (16:08 +1000)
qcsrc/common/mutators/mutator/nades/nades.qc

index 720a8f0e80ee8618744a1eb7bd7e90aaec03426c..b54ee9176b1a68da7629d24bd7db2f210195f1ab 100644 (file)
@@ -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
        {