From 2387c6c2c72f78e04eb5bf48870e254fed8b8d4d Mon Sep 17 00:00:00 2001 From: Evil Factory <36804725+evilfactory@users.noreply.github.com> Date: Mon, 27 Sep 2021 15:28:12 -0300 Subject: [PATCH] fix itemThink --- .../SharedSource/Items/Components/ItemComponent.cs | 6 ------ Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs | 2 ++ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs index bec525565..a5e19f9ac 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs @@ -404,18 +404,12 @@ namespace Barotrauma.Items.Components //called when isActive is true and condition > 0.0f public virtual void Update(float deltaTime, Camera cam) { -#if SERVER - GameMain.Lua.hook.Call("itemThink." + item.prefab.Identifier, new object[]{item}); -#endif ApplyStatusEffects(ActionType.OnActive, deltaTime); } //called when isActive is true and condition == 0.0f public virtual void UpdateBroken(float deltaTime, Camera cam) { -#if SERVER - GameMain.Lua.hook.Call("itemThink." + item.prefab.Identifier, new object[]{item}); -#endif #if CLIENT StopSounds(ActionType.OnActive); #endif diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs index 67d1b297b..fbd7cde25 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Item.cs @@ -1564,6 +1564,8 @@ namespace Barotrauma aiTarget?.Update(deltaTime); + GameMain.Lua.hook.Call("itemThink." + prefab.Identifier, new object[] { this }); + if (!isActive) { return; } ApplyStatusEffects(ActionType.Always, deltaTime, character: (parentInventory as CharacterInventory)?.Owner as Character);