From 9b8502fe368052b4b81985084542548e6992cf72 Mon Sep 17 00:00:00 2001 From: bones_was_here Date: Tue, 14 Mar 2023 01:24:41 +1000 Subject: [PATCH] Fix an inconsistency with applying ITEM_FLAG_MUTATORBLOCKED --- qcsrc/server/items/items.qc | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/qcsrc/server/items/items.qc b/qcsrc/server/items/items.qc index 6b653d9c3..ea69ece56 100644 --- a/qcsrc/server/items/items.qc +++ b/qcsrc/server/items/items.qc @@ -98,6 +98,9 @@ void UpdateItemAfterTeleport(entity this) bool have_pickup_item(entity this) { + if (this.itemdef.spawnflags & ITEM_FLAG_MUTATORBLOCKED) + return false; + if(this.itemdef.instanceOfPowerup) { if(autocvar_g_powerups > 0) @@ -1165,12 +1168,6 @@ void StartItem(entity this, GameItem def) { def = def.m_spawnfunc_hookreplace(def, this); - if (def.spawnflags & ITEM_FLAG_MUTATORBLOCKED) - { - delete(this); - return; // TODO does not set startitem_failed - } - this.classname = def.m_canonical_spawnfunc; _StartItem( -- 2.39.2