nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-15 16:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
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;
}

7
src/server/scripts/World/go_scripts.cpp
View File

@@ -36,7 +36,6 @@ EndContentData */
#include "GameObjectAI.h"
#include "Spell.h"
#include "Player.h"
#include "GameTime.h"
#include "WorldSession.h"
// Ours
@@ -837,7 +836,7 @@ class go_inconspicuous_landmark : public GameObjectScript
public:
go_inconspicuous_landmark() : GameObjectScript("go_inconspicuous_landmark")
{
_lastUsedTime = GameTime::GetGameTime();
_lastUsedTime = time(NULL);
}
bool OnGossipHello(Player* player, GameObject* /*go*/)
@@ -845,10 +844,10 @@ class go_inconspicuous_landmark : public GameObjectScript
if (player->HasItemCount(ITEM_CUERGOS_KEY))
return true;
if (_lastUsedTime > GameTime::GetGameTime())
if (_lastUsedTime > time(NULL))
return true;
_lastUsedTime = GameTime::GetGameTime() + MINUTE;
_lastUsedTime = time(NULL) + MINUTE;
player->CastSpell(player, SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB, true);
return true;
}

5
src/server/scripts/World/npcs_special.cpp
View File

@@ -33,7 +33,6 @@ EndContentData */
#include "ObjectMgr.h"
#include "ScriptMgr.h"
#include "World.h"
#include "GameTime.h"
#include "CreatureTextMgr.h"
#include "PassiveAI.h"
#include "GameEventMgr.h"
@@ -109,7 +108,7 @@ public:
{
case EVENT_CLEARWATER_ANNOUNCE:
{
time_t curtime = GameTime::GetGameTime();
time_t curtime = time(NULL);
tm strdate;
ACE_OS::localtime_r(&curtime, &strdate);
@@ -254,7 +253,7 @@ public:
{
case EVENT_RIGGLE_ANNOUNCE:
{
time_t curtime = GameTime::GetGameTime();
time_t curtime = time(NULL);
tm strdate;
ACE_OS::localtime_r(&curtime, &strdate);
if (!startWarning && strdate.tm_hour == 14 && strdate.tm_min == 0)