Ensure that all actions are compared to fixed point in time (ie. world update start)

Port From (https://github.com/TrinityCore/TrinityCore/commit/60663d1374beef3103f4787152654034fa4a8897)
This commit is contained in:
hondacrx
2019-09-01 10:37:14 -04:00
parent dccded6a96
commit 87d30caa49
38 changed files with 302 additions and 169 deletions
+4 -4
View File
@@ -276,7 +276,7 @@ namespace Scripts.World
{
uint triggerId = trigger.Id;
// Second trigger happened too early after first, skip for now
if (Global.WorldMgr.GetGameTime() - _triggerTimes[triggerId] < AreaTriggerConst.AreatriggerTalkCooldown)
if (GameTime.GetGameTime() - _triggerTimes[triggerId] < AreaTriggerConst.AreatriggerTalkCooldown)
return false;
switch (triggerId)
@@ -295,7 +295,7 @@ namespace Scripts.World
break;
}
_triggerTimes[triggerId] = Global.WorldMgr.GetGameTime();
_triggerTimes[triggerId] = GameTime.GetGameTime();
return false;
}
@@ -318,7 +318,7 @@ namespace Scripts.World
return false;
uint triggerId = trigger.Id;
if (Global.WorldMgr.GetGameTime() - _triggerTimes[trigger.Id] < AreaTriggerConst.SummonCooldown)
if (GameTime.GetGameTime() - _triggerTimes[trigger.Id] < AreaTriggerConst.SummonCooldown)
return false;
switch (triggerId)
@@ -347,7 +347,7 @@ namespace Scripts.World
player.SummonCreature(AreaTriggerConst.NpcSpotlight, x, y, z, 0.0f, TempSummonType.TimedDespawn, 5000);
player.AddAura(AreaTriggerConst.SpellA52Neuralyzer, player);
_triggerTimes[trigger.Id] = Global.WorldMgr.GetGameTime();
_triggerTimes[trigger.Id] = GameTime.GetGameTime();
return false;
}