From 289be4d97c7ac51d8de622c14e33bed08e4e47ae Mon Sep 17 00:00:00 2001
From: jackpoz <giacomopoz@gmail.com>
Date: Sat, 12 May 2018 13:59:34 +0200
Subject: 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)
---
 src/server/worldserver/Main.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/worldserver/Main.cpp')

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)
     {
-- 
cgit v1.2.3