From d89b2f11b5fc334a064f542b4fb0b71a6746ce0d Mon Sep 17 00:00:00 2001 From: Akkadius Date: Fri, 10 Apr 2020 02:03:30 -0500 Subject: [PATCH] Get time remaining directly from database for now, this needs to be cached better at the zone state level, I'll refactor this when repositories are merged in --- zone/client_packet.cpp | 2 +- zone/zone.cpp | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp index 779a4e352..542b52288 100644 --- a/zone/client_packet.cpp +++ b/zone/client_packet.cpp @@ -825,7 +825,7 @@ void Client::CompleteConnect() if (zone && zone->GetInstanceID() > 0) { - uint32 remaining_time_seconds = zone->GetInstanceTimeRemaining(); + uint32 remaining_time_seconds = database.GetTimeRemainingInstance(zone->GetInstanceID()); uint32 day = (remaining_time_seconds / 86400); uint32 hour = (remaining_time_seconds / 3600) % 24; uint32 minute = (remaining_time_seconds / 60) % 60; diff --git a/zone/zone.cpp b/zone/zone.cpp index 9e50d0b8c..55de2b291 100755 --- a/zone/zone.cpp +++ b/zone/zone.cpp @@ -1018,10 +1018,6 @@ bool Zone::Init(bool iStaticZone) { petition_list.ClearPetitions(); petition_list.ReadDatabase(); - if (zone->GetInstanceID() > 0) { - zone->SetInstanceTimeRemaining(database.GetTimeRemainingInstance(zone->GetInstanceID())); - } - LogInfo("Loading timezone data"); zone->zone_time.setEQTimeZone(database.GetZoneTZ(zoneid, GetInstanceVersion()));