From 2babd132645c34ccb808385a8d8c235e06fa74ef Mon Sep 17 00:00:00 2001 From: Mario Date: Wed, 6 May 2020 05:56:01 +1000 Subject: [PATCH] Don't allow giving buffs that are disabled, fixes #2437 --- qcsrc/common/mutators/mutator/buffs/sv_buffs.qh | 2 ++ qcsrc/common/t_items.qc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh index 88efc94ebb..b585811873 100644 --- a/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh +++ b/qcsrc/common/mutators/mutator/buffs/sv_buffs.qh @@ -82,3 +82,5 @@ const vector BUFF_MAX = ('16 16 60'); // client side options .float cvar_cl_buffs_autoreplace; + +float buff_Available(entity buff); diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc index d9bd7bdc96..6f385cdb4e 100644 --- a/qcsrc/common/t_items.qc +++ b/qcsrc/common/t_items.qc @@ -23,6 +23,7 @@ #include #include + #include #include "../lib/warpzone/util_server.qh" #elif defined(CSQC) @@ -1827,7 +1828,7 @@ float GiveItems(entity e, float beginarg, float endarg) got += GiveResourceValue(e, RES_FUEL, op, val); break; default: - FOREACH(Buffs, it != BUFF_Null && Buff_UndeprecateName(cmd) == it.netname, + FOREACH(Buffs, it != BUFF_Null && buff_Available(it) && Buff_UndeprecateName(cmd) == it.netname, { got += GiveBuff(e, it, op, val); break; -- 2.39.2