Merge branch 'master' into TimePath/features/jetpack_jump

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / miscfunctions.qc

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 1a2f25d1f036aa43b424ca0026872f3f8b64e9ba..e6fda399e27eb0427e90a241964f623843a54feb 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -1762,7 +1762,9 @@ float WarpZone_Projectile_Touch_ImpactFilter_Callback()
                return TRUE;
        if(SUB_NoImpactCheck())
        {
-               if(self.classname == "grapplinghook")
+               if(self.classname == "nade")
+                       return FALSE; // no checks here
+               else if(self.classname == "grapplinghook")
                        RemoveGrapplingHook(self.realowner);
                else if(self.classname == "spike")
                {