From 2a637a031b70878db2b7a81227be7e501200ce0f Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Sat, 8 Jun 2019 23:09:23 -0400 Subject: [PATCH] Other task stuff in zone is using time not our timer --- world/cliententry.cpp | 2 +- world/shared_tasks.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/world/cliententry.cpp b/world/cliententry.cpp index c081a8541..6ae9ebaf8 100644 --- a/world/cliententry.cpp +++ b/world/cliententry.cpp @@ -373,7 +373,7 @@ int ClientListEntry::GetTaskLockoutTimeLeft(int id) const [id](const TaskTimer &a) { return a.ID == id; }); if (it != m_task_replay_timers.end()) - return it->expires - Timer::GetCurrentTime(); + return it->expires - time(nullptr); return 0; } diff --git a/world/shared_tasks.cpp b/world/shared_tasks.cpp index 65efb53e0..1a0291d46 100644 --- a/world/shared_tasks.cpp +++ b/world/shared_tasks.cpp @@ -133,7 +133,7 @@ void SharedTaskManager::HandleTaskRequest(ServerPacket *pack) // check our lock out timer int expires = cle->GetTaskLockoutExpire(task_id); - if ((expires - Timer::GetCurrentTime()) >= 0) { + if ((expires - time(nullptr)) >= 0) { // failure TODO: appropriate message, we need to send the timestamp here auto pack = new ServerPacket(ServerOP_TaskReject, leader_name.size() + 1 + 8); pack->WriteUInt32(0); // string ID or just generic fail message