Merge branch 'terencehill/ca_arena_freezetag_bugfixes' into terencehill/arena_gamemode

[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 f7af47d924036f121a6b8340a8dc2df5a0edaee4..83366b6422adee05de501fbe89a8c7581cd07bcb 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -299,14 +299,10 @@ void FireGrapplingHook (void)
        float s;
        vector vs;
 
-       if((arena_roundbased && time < warmup) || (time < game_starttime))
-               return;
-
-  if(self.freezetag_frozen)
-               return;
-       
-       if(self.vehicle)
-               return;
+       if(time < game_starttime) return;
+       if(self.player_blocked) return;
+       if(self.freezetag_frozen) return;
+       if(self.vehicle) return;
 
        makevectors(self.v_angle);