Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

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

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index fbb4271dfbdaedfd46acdfb280615576fa76c878..2081b688dcb0f3d964bf3f1f374a80b2b993579d 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -79,6 +79,8 @@ void RemoveGrapplingHooks(entity pl)
        for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
     {
        .entity weaponentity = weaponentities[slot];
+       if(!pl.(weaponentity))
+               continue; // continue incase other slots exist?
        if(pl.(weaponentity).hook)
                delete(pl.(weaponentity).hook);
        pl.(weaponentity).hook = NULL;