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

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

9
src/server/scripts/World/areatrigger_scripts.cpp
View file

@ -26,7 +26,6 @@ EndContentData */
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "Player.h"
#include "GameTime.h"
#include "SpellMgr.h"
// Ours
@ -383,7 +382,7 @@ class AreaTrigger_at_brewfest : public AreaTriggerScript
{
uint32 triggerId = trigger->entry;
// Second trigger happened too early after first, skip for now
if (GameTime::GetGameTime() - _triggerTimes[triggerId] < AREATRIGGER_TALK_COOLDOWN)
if (sWorld->GetGameTime() - _triggerTimes[triggerId] < AREATRIGGER_TALK_COOLDOWN)
return false;
switch (triggerId)
@ -400,7 +399,7 @@ class AreaTrigger_at_brewfest : public AreaTriggerScript
break;
}
_triggerTimes[triggerId] = GameTime::GetGameTime();
_triggerTimes[triggerId] = sWorld->GetGameTime();
return false;
}
@ -440,7 +439,7 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript
return false;
uint32 triggerId = trigger->entry;
if (GameTime::GetGameTime() - _triggerTimes[trigger->entry] < SUMMON_COOLDOWN)
if (sWorld->GetGameTime() - _triggerTimes[trigger->entry] < SUMMON_COOLDOWN)
return false;
switch (triggerId)
@ -469,7 +468,7 @@ class AreaTrigger_at_area_52_entrance : public AreaTriggerScript
player->SummonCreature(NPC_SPOTLIGHT, x, y, z, 0.0f, TEMPSUMMON_TIMED_DESPAWN, 5000);
player->AddAura(SPELL_A52_NEURALYZER, player);
_triggerTimes[trigger->entry] = GameTime::GetGameTime();
_triggerTimes[trigger->entry] = sWorld->GetGameTime();
return false;
}