From 203ba2d340f7e184713608bca2d6c6965e692667 Mon Sep 17 00:00:00 2001 From: Paul Coene Date: Fri, 15 Oct 2021 13:17:51 -0400 Subject: [PATCH] [Bug Fix] Urgent - Previous fix for TimeSync on static zones broke dynamic zones. (#1605) * [BugFix] Urgent - Previous fix for TimeSync on static zones broke dynamic zones * Use local variable instead of inline accessor for consistancy. Co-authored-by: Noudess --- zone/zone.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/zone/zone.cpp b/zone/zone.cpp index a5be7d140..56a93bd96 100755 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -150,10 +150,19 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) { } LogInfo("---- Zone server [{}], listening on port:[{}] ----", zonename, ZoneConfig::get()->ZonePort); - LogInfo("Zone Bootup: [{}] ([{}]: [{}])", zonename, iZoneID, iInstanceID); + LogInfo("Zone Bootup: [{}] [{}] ([{}]: [{}])", + (iStaticZone) ? "Static" : "Dynamic", zonename, iZoneID, iInstanceID); parse->Init(); UpdateWindowTitle(nullptr); + // Dynamic zones need to Sync here. + // Static zones sync when they connect in worldserver.cpp. + // Static zones cannot sync here as request is ignored by worldserver. + if (!iStaticZone) + { + zone->GetTimeSync(); + } + zone->RequestUCSServerStatus(); /**