aboutsummaryrefslogtreecommitdiff
path: root/src/server/worldserver/Main.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2018-05-12 13:59:34 +0200
committerjackpoz <giacomopoz@gmail.com>2018-05-12 13:59:34 +0200
commit7b7dc1b50844027853023491c1f69dc40292eec3 (patch)
tree25b2c2acb34fde4f11c43b3d0119dcfc620250ed /src/server/worldserver/Main.cpp
parent8fe74bf0f90aab0b23d5ff21079cba4201bb4fdf (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.
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 c6461775066..9bbb353cea2 100644
--- a/src/server/worldserver/Main.cpp
+++ b/src/server/worldserver/Main.cpp
@@ -86,7 +86,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)
{