aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver/Main.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2018-05-12 13:59:34 +0200
committerShauren <shauren.trinity@gmail.com>2021-09-26 20:51:09 +0200
commit289be4d97c7ac51d8de622c14e33bed08e4e47ae (patch)
treed0191a353f2ceecdd7d71cd38694487792df0921 /src/server/worldserver/Main.cpp
parent501bb9dc6702f8130ccd077bad30828705454a01 (diff)
Core/Misc: Fix FreezeDetector triggered on startup
Fix FreezeDetector triggering the assert on startup if scripts took more than a few seconds to initialize. (cherry picked from commit 7b7dc1b50844027853023491c1f69dc40292eec3)
Diffstat (limited to 'src/server/worldserver/Main.cpp')
-rw-r--r--src/server/worldserver/Main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp
index 8e3452940a7..f8f62233bf7 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -87,7 +87,7 @@ class FreezeDetector
{
public:
FreezeDetector(Trinity::Asio::IoContext& ioContext, uint32 maxCoreStuckTime)
- : _timer(ioContext), _worldLoopCounter(0), _lastChangeMsTime(0), _maxCoreStuckTimeInMs(maxCoreStuckTime) { }
+ : _timer(ioContext), _worldLoopCounter(0), _lastChangeMsTime(getMSTime()), _maxCoreStuckTimeInMs(maxCoreStuckTime) { }
static void Start(std::shared_ptr<FreezeDetector> const& freezeDetector)
{