From 2b871c8c48d2a1ff19caedf53edd17835fcf3507 Mon Sep 17 00:00:00 2001 From: EvilFactory Date: Thu, 15 Dec 2022 09:10:10 -0300 Subject: [PATCH] Fix think hook getting called twice on the client --- Barotrauma/BarotraumaClient/ClientSource/GameMain.cs | 8 -------- Barotrauma/BarotraumaServer/ServerSource/GameMain.cs | 1 - .../BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs | 9 +++++++++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs b/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs index 53966b04a..bbbbf13d0 100644 --- a/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs +++ b/Barotrauma/BarotraumaClient/ClientSource/GameMain.cs @@ -927,16 +927,8 @@ namespace Barotrauma SoundManager?.Update(); - Stopwatch luaSw = new Stopwatch(); - - luaSw.Start(); - GameMain.LuaCs.Update(); - luaSw.Stop(); - PerformanceCounter.AddElapsedTicks("Think Hook", luaSw.ElapsedTicks); - - Timing.Accumulator -= Timing.Step; updateCount++; diff --git a/Barotrauma/BarotraumaServer/ServerSource/GameMain.cs b/Barotrauma/BarotraumaServer/ServerSource/GameMain.cs index 6ef5e5dc9..08be0d381 100644 --- a/Barotrauma/BarotraumaServer/ServerSource/GameMain.cs +++ b/Barotrauma/BarotraumaServer/ServerSource/GameMain.cs @@ -349,7 +349,6 @@ namespace Barotrauma CoroutineManager.Update(paused: false, (float)Timing.Step); GameMain.LuaCs.Update(); - GameMain.LuaCs.Hook.Call("think", new object[] { }); performanceCounterTimer.Stop(); if (GameMain.LuaCs.PerformanceCounter.EnablePerformanceCounter) { diff --git a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs index a17d1a190..6e495524b 100644 --- a/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs +++ b/Barotrauma/BarotraumaShared/SharedSource/LuaCs/LuaCsSetup.cs @@ -200,7 +200,16 @@ namespace Barotrauma { Timer?.Update(); Steam?.Update(); + +#if CLIENT + Stopwatch luaSw = new Stopwatch(); + luaSw.Start(); +#endif Hook?.Call("think"); +#if CLIENT + luaSw.Stop(); + GameMain.PerformanceCounter.AddElapsedTicks("Think Hook", luaSw.ElapsedTicks); +#endif } public void Stop()