Merge branch 'master' into TimePath/items

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / hook.qc

diff --git a/qcsrc/common/weapons/weapon/hook.qc b/qcsrc/common/weapons/weapon/hook.qc
index d73c7276fd35b855e2adbeb8ec79b95a400b6359..0687efe1911db0d905f13aa1d7943cf1bb01b4a2 100644 (file)
--- a/qcsrc/common/weapons/weapon/hook.qc
+++ b/qcsrc/common/weapons/weapon/hook.qc
@@ -293,6 +293,8 @@ void W_Hook_Attack2(Weapon thiswep, entity actor)
                }
                METHOD(Hook, wr_resetplayer, void(entity thiswep))
                {
+                       RemoveGrapplingHook(self);
+                       self.hook_time = 0;
                        self.hook_refire = time;
                }
                METHOD(Hook, wr_suicidemessage, int(entity thiswep))