Add Arena to the mutator system, making use of round_handler. Also add support for...

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

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index 81102d62da9ac07cdf500e40f32b36f3f9cf5acb..a131576a86edd067d7c78e85c4c5863f58fd0eeb 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -372,12 +372,15 @@ void W_WeaponFrame()
        if (frametime)
                self.weapon_frametime = frametime;
 
-       if(((g_arena && arena_roundbased) && time < warmup) || ((time < game_starttime) && !autocvar_sv_ready_restart_after_countdown))
+       if(time < game_starttime && !autocvar_sv_ready_restart_after_countdown)
                return;
 
        if(round_handler_IsActive() && !round_handler_IsRoundStarted())
                return;
 
+       if(self.player_blocked)
+               return;
+
        if(self.freezetag_frozen == 1)
                return;