nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-26 15:16:24 +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

5
src/server/scripts/Events/brewfest.cpp
View File

@@ -9,7 +9,6 @@
#include "SpellScript.h"
#include "GameEventMgr.h"
#include "Group.h"
#include "GameTime.h"
#include "LFGMgr.h"
#include "PassiveAI.h"
#include "CellImpl.h"
@@ -436,7 +435,7 @@ class npc_brewfest_keg_reciver : public CreatureScript
{
if (Aura* aur = player->GetAura(SPELL_RAM_AURA))
{
int32 diff = aur->GetApplyTime() - (GameTime::GetGameTime()-(HOUR*18)+spellCooldown);
int32 diff = aur->GetApplyTime() - (time(NULL)-(HOUR*18)+spellCooldown);
if (diff > 10) // aura applied later
return;
@@ -844,7 +843,7 @@ class npc_dark_iron_attack_generator : public CreatureScript
bool AllowStart()
{
time_t curtime = GameTime::GetGameTime();
time_t curtime = time(NULL);
tm strDate;
ACE_OS::localtime_r(&curtime, &strDate);

5
src/server/scripts/Events/midsummer.cpp
View File

@@ -1,7 +1,6 @@
// Scripted by Xinef
#include "ScriptMgr.h"
#include "GameTime.h"
#include "ScriptedCreature.h"
#include "ScriptedGossip.h"
#include "Spell.h"
@@ -185,7 +184,7 @@ class npc_midsummer_torch_target : public CreatureScript
Position pos;
pos.Relocate(posVec.at(num));
me->m_last_notify_position.Relocate(0.0f, 0.0f, 0.0f);
me->m_last_notify_mstime = GameTime::GetGameTimeMS() + 10000;
me->m_last_notify_mstime = World::GetGameTimeMS() + 10000;
me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation());
}
@@ -301,7 +300,7 @@ public:
}
// Achievement
if ((GameTime::GetGameTime() - GetApplyTime()) > 60 && target->GetTypeId() == TYPEID_PLAYER)
if ((time(NULL) - GetApplyTime()) > 60 && target->GetTypeId() == TYPEID_PLAYER)
target->ToPlayer()->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_BE_SPELL_TARGET, 58934, 0, target);
}
}