mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-22 02:04:52 +01:00
Temporary revert 6743 commit. I fix this patch across 1-2 days.
--HG-- branch : trunk
This commit is contained in:
@@ -42,7 +42,7 @@
|
||||
#include "GlobalEvents.h"
|
||||
#include "OutdoorPvPWG.h"
|
||||
#include "OutdoorPvPMgr.h"
|
||||
#include "TimeMgr.h"
|
||||
|
||||
#include "TargetedMovementGenerator.h" // for HandleNpcUnFollowCommand
|
||||
#include "CreatureGroups.h"
|
||||
|
||||
@@ -79,7 +79,7 @@ bool ChatHandler::HandleMuteCommand(const char* args)
|
||||
if(HasLowerSecurity (target,target_guid,true))
|
||||
return false;
|
||||
|
||||
time_t mutetime = sGameTime.GetGameTime() + notspeaktime*60;
|
||||
time_t mutetime = time(NULL) + notspeaktime*60;
|
||||
|
||||
if (target)
|
||||
target->GetSession()->m_muteTime = mutetime;
|
||||
@@ -536,7 +536,7 @@ bool ChatHandler::HandleGameObjectTargetCommand(const char* args)
|
||||
|
||||
if(target)
|
||||
{
|
||||
int32 curRespawnDelay = target->GetRespawnTimeEx()-sGameTime.GetGameTime();
|
||||
int32 curRespawnDelay = target->GetRespawnTimeEx()-time(NULL);
|
||||
if(curRespawnDelay < 0)
|
||||
curRespawnDelay = 0;
|
||||
|
||||
@@ -3502,8 +3502,8 @@ bool ChatHandler::HandleEventInfoCommand(const char* args)
|
||||
std::string endTimeStr = TimeToTimestampStr(eventData.end);
|
||||
|
||||
uint32 delay = gameeventmgr.NextCheck(event_id);
|
||||
time_t nextTime = sGameTime.GetGameTime()+delay;
|
||||
std::string nextStr = nextTime >= eventData.start && nextTime < eventData.end ? TimeToTimestampStr(sGameTime.GetGameTime()+delay) : "-";
|
||||
time_t nextTime = time(NULL)+delay;
|
||||
std::string nextStr = nextTime >= eventData.start && nextTime < eventData.end ? TimeToTimestampStr(time(NULL)+delay) : "-";
|
||||
|
||||
std::string occurenceStr = secsToTimeString(eventData.occurence * MINUTE);
|
||||
std::string lengthStr = secsToTimeString(eventData.length * MINUTE);
|
||||
|
||||
Reference in New Issue
Block a user