ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

Revert "feat(core): Ensure that all actions are compared to fixed point in time (#1236) (#1458)" (#1471)

Browse source 
This reverts commit 51b8773528.
This commit is contained in:
Nefertumm 2019-02-15 15:14:49 -03:00 • committed by GitHub
parent 23e7ae6a2f
commit c15206fc15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
108 changed files with 509 additions and 933 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/server/game/Scripting/MapScripts.cpp
View file

@ -12,7 +12,6 @@
#include "MapManager.h"
#include "MapRefManager.h"
#include "ObjectMgr.h"
#include "GameTime.h"
#include "Pet.h"
#include "ScriptedCreature.h"
#include "ScriptMgr.h"
@ -44,7 +43,7 @@ void Map::ScriptsStart(ScriptMapMap const& scripts, uint32 id, Object* source, O
sa.ownerGUID = ownerGUID;
sa.script = &iter->second;
m_scriptSchedule.insert(ScriptScheduleMap::value_type(time_t(GameTime::GetGameTime() + iter->first), sa));
m_scriptSchedule.insert(ScriptScheduleMap::value_type(time_t(sWorld->GetGameTime() + iter->first), sa));
if (iter->first == 0)
immedScript = true;
@ -74,7 +73,7 @@ void Map::ScriptCommandStart(ScriptInfo const& script, uint32 delay, Object* sou
sa.ownerGUID = ownerGUID;
sa.script = &script;
m_scriptSchedule.insert(ScriptScheduleMap::value_type(time_t(GameTime::GetGameTime() + delay), sa));
m_scriptSchedule.insert(ScriptScheduleMap::value_type(time_t(sWorld->GetGameTime() + delay), sa));
sScriptMgr->IncreaseScheduledScriptsCount();
@ -281,7 +280,7 @@ void Map::ScriptsProcess()
///- Process overdue queued scripts
ScriptScheduleMap::iterator iter = m_scriptSchedule.begin();
// ok as multimap is a *sorted* associative container
while (!m_scriptSchedule.empty() && (iter->first <= GameTime::GetGameTime()))
while (!m_scriptSchedule.empty() && (iter->first <= sWorld->GetGameTime()))
{
ScriptAction const& step = iter->second;