diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 2a3dfec9f75..6fcbc5b75a5 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -851,7 +851,7 @@ uint64 Spell::CalculateDelayMomentForDst() const void Spell::RecalculateDelayMomentForDst() { m_delayMoment = CalculateDelayMomentForDst(); - m_caster->m_Events.ModifyEventTime(_spellEvent, GetDelayStart() + m_delayMoment); + m_caster->m_Events.ModifyEventTime(_spellEvent, Milliseconds(GetDelayStart() + m_delayMoment)); } void Spell::SelectEffectImplicitTargets(SpellEffIndex effIndex, SpellImplicitTargetInfo const& targetType, uint32& processedEffectMask) @@ -7480,7 +7480,7 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time) if (n_offset) { // re-add us to the queue - m_Spell->GetCaster()->m_Events.AddEvent(this, m_Spell->GetDelayStart() + n_offset, false); + m_Spell->GetCaster()->m_Events.AddEvent(this, Milliseconds(m_Spell->GetDelayStart() + n_offset), false); return false; // event not complete } // event complete @@ -7492,7 +7492,7 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time) // delaying had just started, record the moment m_Spell->SetDelayStart(e_time); // re-plan the event for the delay moment - m_Spell->GetCaster()->m_Events.AddEvent(this, e_time + m_Spell->GetDelayMoment(), false); + m_Spell->GetCaster()->m_Events.AddEvent(this, Milliseconds(e_time + m_Spell->GetDelayMoment()), false); return false; // event not complete } break; @@ -7506,7 +7506,7 @@ bool SpellEvent::Execute(uint64 e_time, uint32 p_time) } // spell processing not complete, plan event on the next update interval - m_Spell->GetCaster()->m_Events.AddEvent(this, e_time + 1, false); + m_Spell->GetCaster()->m_Events.AddEvent(this, Milliseconds(e_time + 1), false); return false; // event not complete } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp index 787e400a7fa..baec5c8503c 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp @@ -243,7 +243,7 @@ class ActivateLivingConstellation : public BasicEvent return true; // delete event _owner->CastSpell(nullptr, SPELL_TRIGGER_3_ADDS, TRIGGERED_FULL_MASK); - _owner->m_Events.AddEvent(this, execTime + urand(45000, 50000)); + _owner->m_Events.AddEvent(this, Milliseconds(execTime) + randtime(45s, 50s)); return false; } @@ -275,7 +275,7 @@ class SummonUnleashedDarkMatter : public BasicEvent bool Execute(uint64 execTime, uint32 /*diff*/) override { _caster->CastSpell(nullptr, SPELL_SUMMON_UNLEASHED_DARK_MATTER, TRIGGERED_FULL_MASK); - _caster->m_Events.AddEvent(this, execTime + 30000); + _caster->m_Events.AddEvent(this, Milliseconds(execTime) + 30s); return false; } diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index 4d0ca14f5ff..09d38932541 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -395,7 +395,7 @@ class TrashJumpEvent : public BasicEvent case 0: _owner->CastSpell(nullptr, SPELL_LEAP); ++_stage; - _owner->m_Events.AddEvent(this, eventTime + 2000); + _owner->m_Events.AddEvent(this, Milliseconds(eventTime) + 2s); return false; case 1: _owner->SetReactState(REACT_AGGRESSIVE); @@ -426,7 +426,7 @@ class LightningFieldEvent : public BasicEvent if (instance->GetBossState(BOSS_THORIM) == IN_PROGRESS) { _owner->CastSpell(nullptr, SPELL_LIGHTNING_FIELD); - _owner->m_Events.AddEvent(this, eventTime + 1000); + _owner->m_Events.AddEvent(this, Milliseconds(eventTime) + 1s); return false; } } |