Merge branch 'master' into TimePath/modules

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / mutators / mutator / campcheck / sv_campcheck.qc

diff --git a/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc b/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc
index be7d3a2e2bbf3372029df5ea66db773525d87dc5..c4d2e030267114b46cba723d8322a614a0d8de26 100644 (file)
--- a/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc
+++ b/qcsrc/common/mutators/mutator/campcheck/sv_campcheck.qc
@@ -40,6 +40,7 @@ MUTATOR_HOOKFUNCTION(campcheck, PlayerPreThink)
        if(IS_PLAYER(player))
        if(IS_REAL_CLIENT(player)) // bots may camp, but that's no reason to constantly kill them
        if(!IS_DEAD(player))
        if(IS_PLAYER(player))
        if(IS_REAL_CLIENT(player)) // bots may camp, but that's no reason to constantly kill them
        if(!IS_DEAD(player))

+       if(!forbidWeaponUse(player))

        if(!STAT(FROZEN, player))
        if(!PHYS_INPUT_BUTTON_CHAT(player))
        if(autocvar_g_campcheck_interval)
        if(!STAT(FROZEN, player))
        if(!PHYS_INPUT_BUTTON_CHAT(player))
        if(autocvar_g_campcheck_interval)