X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_hook.qc;h=dec6e167d1b413c074374b0d067a440591d225f1;hb=78776096e605e2cbcddeb7e4a022e4a38c8c67f6;hp=f7af47d924036f121a6b8340a8dc2df5a0edaee4;hpb=d5c0efcb78a5ed485ccfc0da2f11274965973101;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index f7af47d92..dec6e167d 100644
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -121,7 +121,7 @@ void GrapplingHookThink()
 		error("Owner lost the hook!\n");
 		return;
 	}
-	if(LostMovetypeFollow(self) || intermission_running)
+	if(LostMovetypeFollow(self) || intermission_running || (round_handler_IsActive() && !round_handler_IsRoundStarted()))
 	{
 		RemoveGrapplingHook(self.realowner);
 		return;
@@ -299,14 +299,8 @@ 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(forbidWeaponUse()) return;
+	if(self.vehicle) return;
 
 	makevectors(self.v_angle);