From 26b8391ad451f5bad64106229744f6b4d27e2995 Mon Sep 17 00:00:00 2001 From: jimmyl <70376633+mc-oofert@users.noreply.github.com> Date: Sun, 26 Sep 2021 11:01:21 +0200 Subject: [PATCH 1/3] dumb --- .../SharedSource/Items/Components/ItemComponent.cs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs index a5e19f9ac..7984a0ec3 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs @@ -404,12 +404,18 @@ 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, null); +#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, null); +#endif #if CLIENT StopSounds(ActionType.OnActive); #endif From 8183ad60d6b55347b42f73c141f9b0f6f727ae72 Mon Sep 17 00:00:00 2001 From: jimmyl <70376633+mc-oofert@users.noreply.github.com> Date: Sun, 26 Sep 2021 11:03:20 +0200 Subject: [PATCH 2/3] how the fuck does this syntax work --- .../SharedSource/Items/Components/ItemComponent.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs index 7984a0ec3..97616959f 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs @@ -405,7 +405,7 @@ namespace Barotrauma.Items.Components public virtual void Update(float deltaTime, Camera cam) { #if SERVER - GameMain.Lua.hook.Call("itemThink." + item.prefab.Identifier, null); + GameMain.Lua.hook.Call("itemThink." + item.prefab.Identifier, item); #endif ApplyStatusEffects(ActionType.OnActive, deltaTime); } @@ -414,7 +414,7 @@ namespace Barotrauma.Items.Components public virtual void UpdateBroken(float deltaTime, Camera cam) { #if SERVER - GameMain.Lua.hook.Call("itemThink." + item.prefab.Identifier, null); + GameMain.Lua.hook.Call("itemThink." + item.prefab.Identifier, item); #endif #if CLIENT StopSounds(ActionType.OnActive); From 26352d744a0c1716624ddcb1b186178301df25f2 Mon Sep 17 00:00:00 2001 From: jimmyl <70376633+mc-oofert@users.noreply.github.com> Date: Sun, 26 Sep 2021 11:05:10 +0200 Subject: [PATCH 3/3] final --- .../SharedSource/Items/Components/ItemComponent.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs index 97616959f..bec525565 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/Items/Components/ItemComponent.cs @@ -405,7 +405,7 @@ namespace Barotrauma.Items.Components public virtual void Update(float deltaTime, Camera cam) { #if SERVER - GameMain.Lua.hook.Call("itemThink." + item.prefab.Identifier, item); + GameMain.Lua.hook.Call("itemThink." + item.prefab.Identifier, new object[]{item}); #endif ApplyStatusEffects(ActionType.OnActive, deltaTime); } @@ -414,7 +414,7 @@ namespace Barotrauma.Items.Components public virtual void UpdateBroken(float deltaTime, Camera cam) { #if SERVER - GameMain.Lua.hook.Call("itemThink." + item.prefab.Identifier, item); + GameMain.Lua.hook.Call("itemThink." + item.prefab.Identifier, new object[]{item}); #endif #if CLIENT StopSounds(ActionType.OnActive);