From 88ae43fa516ec5b195bfb9047a6c140541fcab72 Mon Sep 17 00:00:00 2001 From: ariel- Date: Wed, 13 Dec 2017 14:43:12 -0300 Subject: Core/Misc: minor typo and codestyle fixes - Replace NULL uses in new code with nullptr - Fix wrong (accumulated) load time log when loading calendar invites - Make Creature::CanRegenerateHealth const as its just a getter - Mark OnlyOnceAreaTriggerScript::OnTrigger as final in case someone wants to override that (you are supposed to use protected _OnTrigger hook) (cherry picked from commit 78a1c687a25d91dd6b13251f28d03ec6a0a49b8a) --- src/server/game/Calendar/CalendarMgr.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/server/game/Calendar/CalendarMgr.cpp') diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index 10d6a424bfd..cc957cb9995 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -94,6 +94,7 @@ void CalendarMgr::LoadFromDB() TC_LOG_INFO("server.loading", ">> Loaded %u calendar events in %u ms", count, GetMSTimeDiffToNow(oldMSTime)); count = 0; + oldMSTime = getMSTime(); // 0 1 2 3 4 5 6 7 if (QueryResult result = CharacterDatabase.Query("SELECT InviteID, EventID, Invitee, Sender, Status, ResponseTime, ModerationRank, Note FROM calendar_invites")) -- cgit v1.2.3