fix hook throwing through warpzone

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index f03f78473f82dfd8e5cfad64ac38720e90221419..7eeb8e22558452fb65deeeb8404812efe097495b 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -247,13 +247,6 @@ void GrapplingHookThink()
 
 void GrapplingHookTouch (void)
 {
-       if(SUB_OwnerCheck())
-               return;
-       if(SUB_NoImpactCheck())
-       {
-               RemoveGrapplingHook(self.realowner);
-               return;
-       }
        PROJECTILE_TOUCH;
 
        GrapplingHook_Stop();

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 8b7806e566e91968bf6cc1211fa759aa4d27ac02..c34941e23f030d278b93caa4d913f85dce101474 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -2014,13 +2014,17 @@ float SUB_NoImpactCheck()
 
 #define SUB_OwnerCheck() (other && (other == self.owner))
 
+void RemoveGrapplingHook(entity pl);
 float WarpZone_Projectile_Touch_ImpactFilter_Callback()
 {
        if(SUB_OwnerCheck())
                return TRUE;
        if(SUB_NoImpactCheck())
        {
-               remove(self);
+               if(self.classname == "grapplinghook")
+                       RemoveGrapplingHook(self.realowner);
+               else
+                       remove(self);
                return TRUE;
        }
        if(trace_ent && trace_ent.solid > SOLID_TRIGGER)