araxiaonline/TrinityCore
3
0
Fork 0
mirror of https://github.com/araxiaonline/TrinityCore.git synced 2026-06-19 22:49:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Scripts/Northrend: Use std::chrono overload of Creature::DespawnOrUnsummon

Browse Source 
(cherry picked from commit fc9e7226c0)
This commit is contained in:
Carbenium
2020-07-26 01:00:29 +02:00
committed by Shauren
parent b8a3ab880f
commit 271462ceec
43 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_prince_taldaram.cpp
+1 -1
View File
@@ -378,7 +378,7 @@ class npc_prince_taldaram_flame_sphere : public CreatureScript
}
case EVENT_DESPAWN:
DoCast(me, SPELL_FLAME_SPHERE_DEATH_EFFECT, true);
me->DespawnOrUnsummon(1000);
me->DespawnOrUnsummon(1s);
break;
default:
break;
src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.cpp
+2 -2
View File
@@ -631,7 +631,7 @@ class npc_acolyte_of_shadron : public CreatureScript
void Reset() override
{
// Despawn the NPC automatically after 28 seconds
me->DespawnOrUnsummon(28000);
me->DespawnOrUnsummon(28s);
//if not solo fight, buff main boss, else place debuff on mini-boss. both spells TARGET_SCRIPT
if (instance->GetBossState(DATA_SARTHARION) == IN_PROGRESS)
@@ -717,7 +717,7 @@ class npc_acolyte_of_vesperon : public CreatureScript
void Reset() override
{
// Despawn the NPC automatically after 28 seconds
me->DespawnOrUnsummon(28000);
me->DespawnOrUnsummon(28s);
me->AddAura(SPELL_TWILIGHT_SHIFT_ENTER, me);
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
+3 -3
View File
@@ -636,7 +636,7 @@ class npc_halion_controller : public CreatureScript
_instance->SetBossState(DATA_HALION, FAIL);
_summons.DespawnAll();
me->DespawnOrUnsummon(0, 30s);
me->DespawnOrUnsummon(0s, 30s);
}
void DoAction(int32 action) override
@@ -1297,7 +1297,7 @@ class npc_living_inferno : public CreatureScript
void JustDied(Unit* /*killer*/) override
{
me->DespawnOrUnsummon(1);
me->DespawnOrUnsummon(1ms);
}
void UpdateAI(uint32 diff) override
@@ -1334,7 +1334,7 @@ class npc_living_ember : public CreatureScript
void JustDied(Unit* /*killer*/) override
{
me->DespawnOrUnsummon(1);
me->DespawnOrUnsummon(1ms);
}
};
src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_anubarak_trial.cpp
+3 -3
View File
@@ -476,7 +476,7 @@ class npc_swarm_scarab : public CreatureScript
{
case ACTION_SCARAB_SUBMERGE:
DoCast(SPELL_SUBMERGE_EFFECT);
me->DespawnOrUnsummon(1*IN_MILLISECONDS);
me->DespawnOrUnsummon(1s);
break;
default:
break;
@@ -804,7 +804,7 @@ class npc_anubarak_spike : public CreatureScript
me->CastSpell(me, SPELL_SPIKE_FAIL, true);
pWho->ToCreature()->DespawnOrUnsummon(3*IN_MILLISECONDS);
pWho->ToCreature()->DespawnOrUnsummon(3s);
// After the spikes hit the icy surface they can't move for about ~5 seconds
_phase = PHASE_NO_MOVEMENT;
@@ -865,7 +865,7 @@ class spell_pursuing_spikes : public AuraScript
PreventDefaultAction();
if (Creature* permafrostCasterCreature = permafrostCaster->ToCreature())
permafrostCasterCreature->DespawnOrUnsummon(3000);
permafrostCasterCreature->DespawnOrUnsummon(3s);
GetTarget()->CastSpell(nullptr, SPELL_SPIKE_FAIL);
GetTarget()->RemoveAllAuras();
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
+5 -5
View File
@@ -649,7 +649,7 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript
if (Creature* uther = ObjectAccessor::GetCreature(*me, _utherGUID))
{
uther->CastSpell(uther, SPELL_UTHER_DESPAWN, true);
uther->DespawnOrUnsummon(5000);
uther->DespawnOrUnsummon(5s);
_utherGUID.Clear();
}
_events.ScheduleEvent(EVENT_INTRO_LK_4, 9s);
@@ -741,10 +741,10 @@ class npc_jaina_or_sylvanas_intro_hor : public CreatureScript
_events.ScheduleEvent(EVENT_KORELN_LORALEN_DEATH, 8s);
if (Creature* lichking = ObjectAccessor::GetCreature(*me, _lichkingGUID))
{
lichking->DespawnOrUnsummon(5000);
lichking->DespawnOrUnsummon(5s);
_lichkingGUID.Clear();
}
me->DespawnOrUnsummon(10000);
me->DespawnOrUnsummon(10s);
_events.ScheduleEvent(EVENT_CLOSE_IMPENETRABLE_DOOR, 7s);
break;
case EVENT_SKIP_INTRO:
@@ -1311,7 +1311,7 @@ class npc_the_lich_king_escape_hor : public CreatureScript
me->StopMoving();
DoPlaySoundToSet(me, SOUND_LK_FURY_OF_FROSTMOURNE);
DoCastAOE(SPELL_FURY_OF_FROSTMOURNE);
me->DespawnOrUnsummon(12000);
me->DespawnOrUnsummon(12s);
_despawn = true;
}
@@ -2566,7 +2566,7 @@ class npc_uther_quel_delar : public CreatureScript
break;
case EVENT_UTHER_11:
DoCast(me, SPELL_ESSENCE_OF_CAPTURED_1, true);
me->DespawnOrUnsummon(3000);
me->DespawnOrUnsummon(3s);
_instance->SetData(DATA_QUEL_DELAR_EVENT, DONE);
break;
case EVENT_UTHER_FACING:
src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+3 -3
View File
@@ -351,14 +351,14 @@ class instance_halls_of_reflection : public InstanceMapScript
if (Creature* lichking = instance->GetCreature(TheLichKingEscapeGUID))
{
lichking->CastSpell(nullptr, SPELL_ACHIEV_CHECK, true);
lichking->DespawnOrUnsummon(1);
lichking->DespawnOrUnsummon(1ms);
}
break;
case FAIL:
DoStopCriteriaTimer(CriteriaStartEvent::SendEvent, ACHIEV_NOT_RETREATING_EVENT);
if (Creature* jainaOrSylvanas = instance->GetCreature(JainaOrSylvanasEscapeGUID))
jainaOrSylvanas->DespawnOrUnsummon(10000);
jainaOrSylvanas->DespawnOrUnsummon(10s);
if (Creature* icewallTarget = instance->GetCreature(IcewallTargetGUID))
icewallTarget->DespawnOrUnsummon();
@@ -631,7 +631,7 @@ class instance_halls_of_reflection : public InstanceMapScript
{
for (ObjectGuid guid : waveGuidList[i])
if (Creature* creature = instance->GetCreature(guid))
creature->DespawnOrUnsummon(1);
creature->DespawnOrUnsummon(1ms);
waveGuidList[i].clear();
}
break;
src/server/scripts/Northrend/IcecrownCitadel/boss_blood_prince_council.cpp
+2 -2
View File
@@ -1058,7 +1058,7 @@ class npc_kinetic_bomb : public CreatureScript
DoCastSelf(SPELL_KINETIC_BOMB_VISUAL, true);
me->SetReactState(REACT_PASSIVE);
me->GetPosition(_x, _y, _groundZ);
me->DespawnOrUnsummon(60000);
me->DespawnOrUnsummon(60s);
_groundZ = me->GetMap()->GetHeight(me->GetPhaseShift(), _x, _y, _groundZ, true, 500.0f);
}
@@ -1088,7 +1088,7 @@ class npc_kinetic_bomb : public CreatureScript
{
case EVENT_BOMB_DESPAWN:
me->SetVisible(false);
me->DespawnOrUnsummon(5000);
me->DespawnOrUnsummon(5s);
break;
case EVENT_CONTINUE_FALLING:
me->GetMotionMaster()->Clear();
src/server/scripts/Northrend/IcecrownCitadel/boss_deathbringer_saurfang.cpp
+2 -2
View File
@@ -387,7 +387,7 @@ class boss_deathbringer_saurfang : public CreatureScript
{
if (target->GetTransport())
{
summon->DespawnOrUnsummon(1);
summon->DespawnOrUnsummon(1ms);
EnterEvadeMode(EVADE_REASON_OTHER);
return;
}
@@ -909,7 +909,7 @@ class npc_muradin_bronzebeard_icc : public CreatureScript
// temp until outro fully done - to put deathbringer on respawn timer (until next reset)
if (Creature* deathbringer = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_DEATHBRINGER_SAURFANG)))
deathbringer->DespawnOrUnsummon(5000);
deathbringer->DespawnOrUnsummon(5s);
break;
}
case ACTION_INTERRUPT_INTRO:
src/server/scripts/Northrend/IcecrownCitadel/boss_icecrown_gunship_battle.cpp
+3 -3
View File
@@ -784,7 +784,7 @@ class npc_gunship : public CreatureScript
GetCreatureListWithEntryInGrid(creatures, me, NPC_KOR_KRON_REAVER, 200.0f);
GetCreatureListWithEntryInGrid(creatures, me, NPC_KOR_KRON_SERGEANT, 200.0f);
for (std::list<Creature*>::iterator itr = creatures.begin(); itr != creatures.end(); ++itr)
(*itr)->DespawnOrUnsummon(1);
(*itr)->DespawnOrUnsummon(1ms);
}
else
{
@@ -938,7 +938,7 @@ class npc_high_overlord_saurfang_igb : public CreatureScript
init.MovebyPath(path, 0);
me->GetMotionMaster()->LaunchMoveSpline(std::move(init), 0, MOTION_PRIORITY_NORMAL, POINT_MOTION_TYPE);
me->DespawnOrUnsummon(18000);
me->DespawnOrUnsummon(18s);
}
}
@@ -1202,7 +1202,7 @@ class npc_muradin_bronzebeard_igb : public CreatureScript
init.MovebyPath(path, 0);
me->GetMotionMaster()->LaunchMoveSpline(std::move(init), 0, MOTION_PRIORITY_NORMAL, POINT_MOTION_TYPE);
me->DespawnOrUnsummon(18000);
me->DespawnOrUnsummon(18s);
}
}
src/server/scripts/Northrend/IcecrownCitadel/boss_professor_putricide.cpp
+2 -2
View File
@@ -917,7 +917,7 @@ class spell_putricide_ooze_channel : public SpellScriptLoader
if (targets.empty())
{
FinishCast(SPELL_FAILED_NO_VALID_TARGETS);
GetCaster()->ToCreature()->DespawnOrUnsummon(1); // despawn next update
GetCaster()->ToCreature()->DespawnOrUnsummon(1ms); // despawn next update
return;
}
@@ -1285,7 +1285,7 @@ class spell_putricide_eat_ooze : public SpellScriptLoader
{
target->RemoveAurasDueToSpell(SPELL_GROW_STACKER);
target->RemoveAura(grow);
target->DespawnOrUnsummon(1);
target->DespawnOrUnsummon(1ms);
}
else
grow->ModStackAmount(-3);
src/server/scripts/Northrend/IcecrownCitadel/boss_rotface.cpp
+1 -1
View File
@@ -841,7 +841,7 @@ class spell_rotface_unstable_ooze_explosion_suicide : public SpellScriptLoader
target->RemoveAllAuras();
target->SetVisible(false);
target->ToCreature()->DespawnOrUnsummon(60000);
target->ToCreature()->DespawnOrUnsummon(60s);
}
void Register() override
src/server/scripts/Northrend/IcecrownCitadel/boss_sister_svalna.cpp
+2 -2
View File
@@ -1393,7 +1393,7 @@ struct npc_impaling_spear : public CreatureAI
{
_vehicleCheckTimer = 500;
if (!me->GetVehicle())
me->DespawnOrUnsummon(100);
me->DespawnOrUnsummon(100ms);
}
else
_vehicleCheckTimer -= diff;
@@ -1455,7 +1455,7 @@ class spell_svalna_remove_spear : public SpellScript
{
if (Unit* vehicle = target->GetVehicleBase())
vehicle->RemoveAurasDueToSpell(SPELL_IMPALING_SPEAR);
target->DespawnOrUnsummon(1);
target->DespawnOrUnsummon(1ms);
}
}
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
+8 -8
View File
@@ -1535,7 +1535,7 @@ class npc_valkyr_shadowguard : public CreatureScript
if (IsHeroic())
ScheduleHeroicEvents();
else
me->DespawnOrUnsummon(1000);
me->DespawnOrUnsummon(1s);
break;
case POINT_CHARGE:
if (Player* target = ObjectAccessor::GetPlayer(*me, _grabbedPlayer))
@@ -1720,7 +1720,7 @@ class npc_strangulate_vehicle : public CreatureScript
case EVENT_DESPAWN_SELF:
if (Creature* lichKing = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_THE_LICH_KING)))
lichKing->AI()->SummonedCreatureDespawn(me);
me->DespawnOrUnsummon(1);
me->DespawnOrUnsummon(1ms);
break;
default:
break;
@@ -1777,7 +1777,7 @@ class npc_terenas_menethil : public CreatureScript
break;
case ACTION_TELEPORT_BACK:
me->CastSpell(nullptr, SPELL_RESTORE_SOUL, TRIGGERED_NONE);
me->DespawnOrUnsummon(3000);
me->DespawnOrUnsummon(3s);
break;
default:
break;
@@ -1807,10 +1807,10 @@ class npc_terenas_menethil : public CreatureScript
if (Creature* warden = me->FindNearestCreature(NPC_SPIRIT_WARDEN, 20.0f))
{
warden->CastSpell(nullptr, SPELL_DESTROY_SOUL, TRIGGERED_NONE);
warden->DespawnOrUnsummon(2000);
warden->DespawnOrUnsummon(2s);
}
me->DespawnOrUnsummon(2000);
me->DespawnOrUnsummon(2s);
}
}
}
@@ -1994,7 +1994,7 @@ class npc_spirit_bomb : public CreatureScript
{
me->RemoveAllAuras();
DoCastAOE(SPELL_EXPLOSION);
me->DespawnOrUnsummon(1000);
me->DespawnOrUnsummon(1s);
}
}
@@ -2405,7 +2405,7 @@ class spell_the_lich_king_ice_burst_target_search : public SpellScriptLoader
{
GetCaster()->ToCreature()->SetReactState(REACT_PASSIVE);
GetCaster()->AttackStop();
GetCaster()->ToCreature()->DespawnOrUnsummon(500);
GetCaster()->ToCreature()->DespawnOrUnsummon(500ms);
}
}
@@ -2836,7 +2836,7 @@ class spell_the_lich_king_vile_spirit_damage_target_search : public SpellScriptL
if (Unit* summoner = summon->GetSummonerUnit())
summoner->GetAI()->SetData(DATA_VILE, 1);
GetCaster()->CastSpell(nullptr, SPELL_SPIRIT_BURST, true);
GetCaster()->ToCreature()->DespawnOrUnsummon(3000);
GetCaster()->ToCreature()->DespawnOrUnsummon(3s);
GetCaster()->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
}
src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
+10 -10
View File
@@ -175,7 +175,7 @@ struct ValithriaManaVoidSelector
class ValithriaDelayedCastEvent : public BasicEvent
{
public:
ValithriaDelayedCastEvent(Creature* trigger, uint32 spellId, ObjectGuid originalCaster, uint32 despawnTime) : _trigger(trigger), _originalCaster(originalCaster), _spellId(spellId), _despawnTime(despawnTime)
ValithriaDelayedCastEvent(Creature* trigger, uint32 spellId, ObjectGuid originalCaster, Milliseconds despawnTime) : _trigger(trigger), _originalCaster(originalCaster), _spellId(spellId), _despawnTime(despawnTime)
{
}
@@ -183,7 +183,7 @@ class ValithriaDelayedCastEvent : public BasicEvent
{
_trigger->CastSpell(_trigger, _spellId, CastSpellExtraArgs(TRIGGERED_FULL_MASK)
.SetOriginalCaster(_originalCaster));
if (_despawnTime)
if (_despawnTime != 0s)
_trigger->DespawnOrUnsummon(_despawnTime);
return true;
}
@@ -192,7 +192,7 @@ class ValithriaDelayedCastEvent : public BasicEvent
Creature* _trigger;
ObjectGuid _originalCaster;
uint32 _spellId;
uint32 _despawnTime;
Milliseconds _despawnTime;
};
class ValithriaAuraRemoveEvent : public BasicEvent
@@ -249,7 +249,7 @@ class ValithriaDespawner : public BasicEvent
return;
}
creature->DespawnOrUnsummon(0, 10s);
creature->DespawnOrUnsummon(0s, 10s);
}
private:
@@ -387,7 +387,7 @@ class boss_valithria_dreamwalker : public CreatureScript
// this display id was found in sniff instead of the one on aura
me->SetDisplayId(11686);
me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->DespawnOrUnsummon(4000);
me->DespawnOrUnsummon(4s);
if (Creature* trigger = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_VALITHRIA_TRIGGER)))
Unit::Kill(me, trigger);
@@ -400,12 +400,12 @@ class boss_valithria_dreamwalker : public CreatureScript
{
if (summon->GetEntry() == NPC_DREAM_PORTAL_PRE_EFFECT)
{
summon->m_Events.AddEvent(new ValithriaDelayedCastEvent(summon, SPELL_SUMMON_DREAM_PORTAL, me->GetGUID(), 6000), summon->m_Events.CalculateTime(15000));
summon->m_Events.AddEvent(new ValithriaDelayedCastEvent(summon, SPELL_SUMMON_DREAM_PORTAL, me->GetGUID(), 6s), summon->m_Events.CalculateTime(15000));
summon->m_Events.AddEvent(new ValithriaAuraRemoveEvent(summon, SPELL_DREAM_PORTAL_VISUAL_PRE), summon->m_Events.CalculateTime(15000));
}
else if (summon->GetEntry() == NPC_NIGHTMARE_PORTAL_PRE_EFFECT)
{
summon->m_Events.AddEvent(new ValithriaDelayedCastEvent(summon, SPELL_SUMMON_NIGHTMARE_PORTAL, me->GetGUID(), 6000), summon->m_Events.CalculateTime(15000));
summon->m_Events.AddEvent(new ValithriaDelayedCastEvent(summon, SPELL_SUMMON_NIGHTMARE_PORTAL, me->GetGUID(), 6s), summon->m_Events.CalculateTime(15000));
summon->m_Events.AddEvent(new ValithriaAuraRemoveEvent(summon, SPELL_NIGHTMARE_PORTAL_VISUAL_PRE), summon->m_Events.CalculateTime(15000));
}
}
@@ -726,12 +726,12 @@ class npc_risen_archmage : public CreatureScript
if (summon->GetEntry() == NPC_COLUMN_OF_FROST)
{
summon->CastSpell(summon, SPELL_COLUMN_OF_FROST_AURA, true);
summon->m_Events.AddEvent(new ValithriaDelayedCastEvent(summon, SPELL_COLUMN_OF_FROST_DAMAGE, ObjectGuid::Empty, 8000), summon->m_Events.CalculateTime(2000));
summon->m_Events.AddEvent(new ValithriaDelayedCastEvent(summon, SPELL_COLUMN_OF_FROST_DAMAGE, ObjectGuid::Empty, 8s), summon->m_Events.CalculateTime(2000));
}
else if (summon->GetEntry() == NPC_MANA_VOID)
{
summon->CastSpell(summon, SPELL_MANA_VOID_AURA, true);
summon->DespawnOrUnsummon(36000);
summon->DespawnOrUnsummon(36s);
}
}
@@ -1098,7 +1098,7 @@ class npc_dream_cloud : public CreatureScript
// must use originalCaster the same for all clouds to allow stacking
me->CastSpell(me, EMERALD_VIGOR, CastSpellExtraArgs(TRIGGERED_FULL_MASK)
.SetOriginalCaster(_instance->GetGuidData(DATA_VALITHRIA_DREAMWALKER)));
me->DespawnOrUnsummon(100);
me->DespawnOrUnsummon(100ms);
break;
default:
break;
src/server/scripts/Northrend/Naxxramas/boss_four_horsemen.cpp
+1 -1
View File
@@ -267,7 +267,7 @@ struct boss_four_horsemen_baseAI : public BossAI
for (Horseman boss : horsemen)
{
if (Creature* cBoss = getHorsemanHandle(boss))
cBoss->DespawnOrUnsummon(0, Seconds(15));
cBoss->DespawnOrUnsummon(0s, 15s);
else
TC_LOG_WARN("scripts", "FourHorsemenAI: Encounter resetting but horseman with id %u is not present", uint32(boss));
}
src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
+1 -1
View File
@@ -813,7 +813,7 @@ public:
me->CombatStop();
me->StopMoving();
me->SetImmuneToPC(true);
me->DespawnOrUnsummon(30 * IN_MILLISECONDS); // just in case anything interrupts the movement
me->DespawnOrUnsummon(30s); // just in case anything interrupts the movement
me->GetMotionMaster()->MoveTargetedHome();
break;
default:
src/server/scripts/Northrend/Naxxramas/boss_maexxna.cpp
+1 -1
View File
@@ -246,7 +246,7 @@ public:
if (Unit* victim = ObjectAccessor::GetUnit(*me, victimGUID))
victim->RemoveAurasDueToSpell(SPELL_WEB_WRAP, me->GetGUID());
me->DespawnOrUnsummon(5 * IN_MILLISECONDS);
me->DespawnOrUnsummon(5s);
}
};
src/server/scripts/Northrend/Naxxramas/boss_thaddius.cpp
+5 -5
View File
@@ -315,7 +315,7 @@ struct boss_thaddius : public BossAI
instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_POSITIVE_CHARGE_APPLY);
instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_NEGATIVE_CHARGE_APPLY);
me->DespawnOrUnsummon(0, Seconds(30));
me->DespawnOrUnsummon(0s, 30s);
me->AddUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED));
me->SetImmuneToPC(true);
@@ -497,7 +497,7 @@ public:
{
if (GameObject* coil = myCoilGO())
coil->SetGoState(GO_STATE_READY);
me->DespawnOrUnsummon(0, Hours(24*7)); // will be force respawned by thaddius
me->DespawnOrUnsummon(0s, 7_days); // will be force respawned by thaddius
}
void DoAction(int32 action) override
@@ -544,7 +544,7 @@ public:
case ACTION_TRANSITION_3:
if (GameObject* coil = myCoilGO())
coil->SetGoState(GO_STATE_READY);
me->DespawnOrUnsummon(0, Hours(24 * 7));
me->DespawnOrUnsummon(0s, 7_days);
break;
default:
break;
@@ -743,7 +743,7 @@ public:
{
if (GameObject* coil = myCoilGO())
coil->SetGoState(GO_STATE_READY);
me->DespawnOrUnsummon(0, Hours(24*7)); // will be force respawned by thaddius
me->DespawnOrUnsummon(0s, 7_days); // will be force respawned by thaddius
}
void DoAction(int32 action) override
@@ -795,7 +795,7 @@ public:
case ACTION_TRANSITION_3:
if (GameObject* coil = myCoilGO())
coil->SetGoState(GO_STATE_READY);
me->DespawnOrUnsummon(0, Hours(24 * 7));
me->DespawnOrUnsummon(0s, 7_days);
break;
default:
break;
src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp
+7 -7
View File
@@ -596,7 +596,7 @@ public:
summons.DespawnAll();
}
me->DespawnOrUnsummon(0, 30s);
me->DespawnOrUnsummon(0s, 30s);
}
void KilledUnit(Unit* victim) override
@@ -987,7 +987,7 @@ public:
}
me->SummonCreature(NPC_ALEXSTRASZA, AlexstraszaSpawnPos, TEMPSUMMON_MANUAL_DESPAWN);
me->DespawnOrUnsummon(5*IN_MILLISECONDS);
me->DespawnOrUnsummon(5s);
}
private:
@@ -1207,7 +1207,7 @@ public:
}
}
me->DespawnOrUnsummon(3*IN_MILLISECONDS);
me->DespawnOrUnsummon(3s);
}
void MovementInform(uint32 type, uint32 id) override
@@ -1287,7 +1287,7 @@ public:
}
else
{
me->DespawnOrUnsummon(3*IN_MILLISECONDS);
me->DespawnOrUnsummon(3s);
}
}
@@ -1472,7 +1472,7 @@ public:
if (Creature* malygos = ObjectAccessor::GetCreature(*me, _instance->GetGuidData(DATA_MALYGOS)))
{
if (malygos->AI()->GetData(DATA_PHASE) == PHASE_TWO)
me->DespawnOrUnsummon(6*IN_MILLISECONDS);
me->DespawnOrUnsummon(6s);
// If evade is hit during phase II shields should disappear with no delay
else if (malygos->AI()->GetData(DATA_PHASE) == 0)
me->DespawnOrUnsummon();
@@ -1541,7 +1541,7 @@ public:
{
if (!apply)
{
me->DespawnOrUnsummon(2050);
me->DespawnOrUnsummon(2050ms);
me->SetOrientation(2.5f);
me->SetSpeedRate(MOVE_FLIGHT, 1.0f);
Position pos = me->GetPosition();
@@ -1579,7 +1579,7 @@ class npc_static_field : public CreatureScript
void IsSummonedBy(WorldObject* /*summoner*/) override
{
// For some great reason the spell doesn't time it...
me->DespawnOrUnsummon(30*IN_MILLISECONDS);
me->DespawnOrUnsummon(30s);
}
};
src/server/scripts/Northrend/Nexus/Oculus/boss_drakos.cpp
+1 -1
View File
@@ -183,7 +183,7 @@ class npc_unstable_sphere : public CreatureScript
Initialize();
me->DespawnOrUnsummon(19000);
me->DespawnOrUnsummon(19s);
}
void UpdateAI(uint32 diff) override
src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp
+3 -3
View File
@@ -224,13 +224,13 @@ class npc_image_belgaristrasz : public CreatureScript
if (summoner->GetEntry() == NPC_VAROS)
{
Talk(SAY_VAROS);
me->DespawnOrUnsummon(60000);
me->DespawnOrUnsummon(60s);
}
if (summoner->GetEntry() == NPC_UROM)
{
Talk(SAY_UROM);
me->DespawnOrUnsummon(60000);
me->DespawnOrUnsummon(60s);
}
}
};
@@ -376,7 +376,7 @@ class npc_ruby_emerald_amber_drake : public CreatureScript
break;
case EVENT_TAKE_OFF:
{
me->DespawnOrUnsummon(2050);
me->DespawnOrUnsummon(2050ms);
me->SetOrientation(2.5f);
me->SetSpeedRate(MOVE_FLIGHT, 1.0f);
Talk(SAY_DRAKES_TAKEOFF);
src/server/scripts/Northrend/Ulduar/Ulduar/boss_algalon_the_observer.cpp
+2 -2
View File
@@ -834,7 +834,7 @@ struct npc_black_hole : public ScriptedAI
if (spellInfo->Id == SPELL_DESPAWN_BLACK_HOLE)
{
_summons.DespawnAll();
me->DespawnOrUnsummon(1);
me->DespawnOrUnsummon(1ms);
}
}
@@ -856,7 +856,7 @@ struct npc_collapsing_star : public PassiveAI
if (Creature* algalon = _instance->GetCreature(BOSS_ALGALON))
algalon->AI()->JustSummoned(summon);
me->DespawnOrUnsummon(1);
me->DespawnOrUnsummon(1ms);
}
void DamageTaken(Unit* /*attacker*/, uint32& damage) override
src/server/scripts/Northrend/Ulduar/Ulduar/boss_assembly_of_iron.cpp
+1 -1
View File
@@ -747,7 +747,7 @@ class spell_assembly_rune_of_summoning : public SpellScriptLoader
void OnRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
{
if (TempSummon* summ = GetTarget()->ToTempSummon())
summ->DespawnOrUnsummon(1);
summ->DespawnOrUnsummon(1ms);
}
void Register() override
src/server/scripts/Northrend/Ulduar/Ulduar/boss_freya.cpp
+9 -9
View File
@@ -515,7 +515,7 @@ class boss_freya : public CreatureScript
for (uint8 n = 0; n < 3; ++n)
{
summons.Despawn(Elemental[n][i]);
Elemental[n][i]->DespawnOrUnsummon(5000);
Elemental[n][i]->DespawnOrUnsummon(5s);
trioDefeated[i] = true;
Elemental[n][i]->CastSpell(me, SPELL_REMOVE_10STACK, true);
}
@@ -623,7 +623,7 @@ class boss_freya : public CreatureScript
me->RemoveAllAttackers();
me->AttackStop();
me->SetFaction(FACTION_FRIENDLY);
me->DespawnOrUnsummon(7500);
me->DespawnOrUnsummon(7500ms);
me->CastSpell(me, SPELL_KNOCK_ON_WOOD_CREDIT, true);
_JustDied();
@@ -677,12 +677,12 @@ class boss_freya : public CreatureScript
case NPC_DETONATING_LASHER:
summoned->CastSpell(me, SPELL_REMOVE_2STACK, true);
summoned->CastSpell(who, SPELL_DETONATE, true);
summoned->DespawnOrUnsummon(5000);
summoned->DespawnOrUnsummon(5s);
summons.Despawn(summoned);
break;
case NPC_ANCIENT_CONSERVATOR:
summoned->CastSpell(me, SPELL_REMOVE_25STACK, true);
summoned->DespawnOrUnsummon(5000);
summoned->DespawnOrUnsummon(5s);
summons.Despawn(summoned);
break;
}
@@ -785,7 +785,7 @@ class boss_elder_brightleaf : public CreatureScript
switch (action)
{
case ACTION_ELDER_FREYA_KILLED:
me->DespawnOrUnsummon(10000);
me->DespawnOrUnsummon(10s);
_JustDied();
break;
}
@@ -894,7 +894,7 @@ class boss_elder_stonebark : public CreatureScript
switch (action)
{
case ACTION_ELDER_FREYA_KILLED:
me->DespawnOrUnsummon(10000);
me->DespawnOrUnsummon(10s);
_JustDied();
break;
}
@@ -988,7 +988,7 @@ class boss_elder_ironbranch : public CreatureScript
switch (action)
{
case ACTION_ELDER_FREYA_KILLED:
me->DespawnOrUnsummon(10000);
me->DespawnOrUnsummon(10s);
_JustDied();
break;
}
@@ -1378,7 +1378,7 @@ class npc_healthy_spore : public CreatureScript
if (lifeTimer <= diff)
{
me->RemoveAurasDueToSpell(SPELL_GROW);
me->DespawnOrUnsummon(2200);
me->DespawnOrUnsummon(2200ms);
lifeTimer = urand(22000, 30000);
}
else
@@ -1418,7 +1418,7 @@ class npc_eonars_gift : public CreatureScript
{
me->RemoveAurasDueToSpell(SPELL_GROW);
DoCast(SPELL_LIFEBINDERS_GIFT);
me->DespawnOrUnsummon(2500);
me->DespawnOrUnsummon(2500ms);
lifeBindersGiftTimer = 12000;
}
else
src/server/scripts/Northrend/Ulduar/Ulduar/boss_general_vezax.cpp
+1 -1
View File
@@ -430,7 +430,7 @@ class npc_saronite_vapors : public CreatureScript
me->SetHealth(me->GetMaxHealth());
me->RemoveAllAuras();
DoCast(me, SPELL_SARONITE_VAPORS);
me->DespawnOrUnsummon(30000);
me->DespawnOrUnsummon(30s);
if (Creature* vezax = instance->GetCreature(BOSS_VEZAX))
vezax->AI()->DoAction(ACTION_VAPORS_DIE);
src/server/scripts/Northrend/Ulduar/Ulduar/boss_hodir.cpp
+1 -1
View File
@@ -417,7 +417,7 @@ class boss_hodir : public CreatureScript
DoCastAOE(SPELL_KILL_CREDIT, true); /// need to be cast before changing boss faction
/// spell will target enemies only
me->SetFaction(FACTION_FRIENDLY);
me->DespawnOrUnsummon(10000);
me->DespawnOrUnsummon(10s);
_JustDied();
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp
+1 -1
View File
@@ -333,7 +333,7 @@ class npc_iron_construct : public CreatureScript
if (ignis->AI())
ignis->AI()->DoAction(ACTION_REMOVE_BUFF);
me->DespawnOrUnsummon(1000);
me->DespawnOrUnsummon(1s);
}
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_mimiron.cpp
+7 -7
View File
@@ -371,9 +371,9 @@ static bool IsEncounterFinished(Unit* who)
Unit::Kill(who, mkii);
Unit::Kill(who, vx001);
Unit::Kill(who, aerial);
mkii->DespawnOrUnsummon(120000);
vx001->DespawnOrUnsummon(120000);
aerial->DespawnOrUnsummon(120000);
mkii->DespawnOrUnsummon(120s);
vx001->DespawnOrUnsummon(120s);
aerial->DespawnOrUnsummon(120s);
if (Creature* mimiron = instance->GetCreature(BOSS_MIMIRON))
mimiron->AI()->JustDied(who);
return true;
@@ -662,7 +662,7 @@ class boss_mimiron : public CreatureScript
case EVENT_OUTTRO_3:
DoCast(me, SPELL_TELEPORT_VISUAL);
me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
me->DespawnOrUnsummon(1000); // sniffs say 6 sec after, but it doesnt matter.
me->DespawnOrUnsummon(1s); // sniffs say 6 sec after, but it doesnt matter.
break;
default:
break;
@@ -1597,7 +1597,7 @@ class npc_mimiron_frost_bomb : public CreatureScript
break;
case EVENT_FROST_BOMB_CLEAR_FIRES:
DoCastAOE(SPELL_CLEAR_FIRES);
me->DespawnOrUnsummon(3000);
me->DespawnOrUnsummon(3s);
break;
default:
break;
@@ -1646,7 +1646,7 @@ class npc_mimiron_proximity_mine : public CreatureScript
case EVENT_PROXIMITY_MINE_DETONATION:
if (me->HasAura(SPELL_PROXIMITY_MINE_PERIODIC_TRIGGER))
DoCastAOE(SPELL_PROXIMITY_MINE_EXPLOSION);
me->DespawnOrUnsummon(1000);
me->DespawnOrUnsummon(1s);
break;
default:
break;
@@ -1729,7 +1729,7 @@ class spell_mimiron_bomb_bot : public SpellScriptLoader
if (Creature* target = GetHitCreature())
{
target->AddUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED));
target->DespawnOrUnsummon(1000);
target->DespawnOrUnsummon(1s);
}
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp
+2 -2
View File
@@ -531,7 +531,7 @@ class boss_thorim : public CreatureScript
if (Creature* sif = instance->GetCreature(DATA_SIF))
{
sif->AI()->Talk(SAY_SIF_DESPAWN);
sif->DespawnOrUnsummon(6000);
sif->DespawnOrUnsummon(6s);
_hardMode = false;
}
}
@@ -569,7 +569,7 @@ class boss_thorim : public CreatureScript
if (Creature* sif = instance->GetCreature(DATA_SIF))
{
summons.Despawn(sif);
sif->DespawnOrUnsummon(10000);
sif->DespawnOrUnsummon(10s);
}
}
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
+1 -1
View File
@@ -1553,7 +1553,7 @@ class npc_observation_ring_keeper : public CreatureScript
return false;
me->RemoveNpcFlag(UNIT_NPC_FLAG_GOSSIP);
me->DespawnOrUnsummon(2000);
me->DespawnOrUnsummon(2s);
DoCast(SPELL_TELEPORT);
Talk(SAY_KEEPER_CHOSEN_1, player);
Talk(SAY_KEEPER_CHOSEN_2, player);
src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+3 -3
View File
@@ -143,14 +143,14 @@ ObjectData const objectData[] =
{ 0, 0 }
};
UlduarKeeperDespawnEvent::UlduarKeeperDespawnEvent(Creature* owner, uint32 despawnTimerOffset) : _owner(owner), _despawnTimer(despawnTimerOffset)
UlduarKeeperDespawnEvent::UlduarKeeperDespawnEvent(Creature* owner, Milliseconds despawnTimerOffset) : _owner(owner), _despawnTimer(despawnTimerOffset)
{
}
bool UlduarKeeperDespawnEvent::Execute(uint64 /*eventTime*/, uint32 /*updateTime*/)
{
_owner->CastSpell(_owner, SPELL_TELEPORT_KEEPER_VISUAL);
_owner->DespawnOrUnsummon(1000 + _despawnTimer);
_owner->DespawnOrUnsummon(1s + _despawnTimer);
return true;
}
@@ -1036,7 +1036,7 @@ class instance_ulduar : public InstanceMapScript
{
vehicle->RemoveAllPassengers();
vehicleCreature->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
vehicleCreature->DespawnOrUnsummon(5 * MINUTE * IN_MILLISECONDS);
vehicleCreature->DespawnOrUnsummon(5min);
}
}
src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h
+4 -4
View File
@@ -514,13 +514,13 @@ class Creature;
class UlduarKeeperDespawnEvent : public BasicEvent
{
public:
UlduarKeeperDespawnEvent(Creature* owner, uint32 despawnTimerOffset = 500);
UlduarKeeperDespawnEvent(Creature* owner, Milliseconds despawnTimerOffset = 500ms);
bool Execute(uint64 /*eventTime*/, uint32 /*updateTime*/) override;
private:
Creature* _owner;
uint32 _despawnTimer;
private:
Creature* _owner;
Milliseconds _despawnTimer;
};
template <class AI, class T>
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_ingvar_the_plunderer.cpp
+1 -1
View File
@@ -398,7 +398,7 @@ class npc_ingvar_throw_dummy : public CreatureScript
if (type == EFFECT_MOTION_TYPE && id == EVENT_CHARGE)
{
me->CastSpell(me, SPELL_SHADOW_AXE_PERIODIC_DAMAGE, true);
me->DespawnOrUnsummon(10000);
me->DespawnOrUnsummon(10s);
}
}
};
src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp
+1 -1
View File
@@ -353,7 +353,7 @@ class spell_frost_tomb : public SpellScriptLoader
if (Unit* caster = GetCaster())
if (caster->IsAlive())
if (Creature* creature = caster->ToCreature())
creature->DespawnOrUnsummon(1000);
creature->DespawnOrUnsummon(1s);
}
void Register() override
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp
+1 -1
View File
@@ -295,7 +295,7 @@ public:
me->SetImmuneToPC(false);
DoZoneInCombat();
if (Creature* orb = ObjectAccessor::GetCreature(*me, _orb))
orb->DespawnOrUnsummon(1000);
orb->DespawnOrUnsummon(1s);
break;
case ACTION_START_ENCOUNTER:
if (Creature* orb = ObjectAccessor::GetCreature(*me, _orb))
src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp
+1 -1
View File
@@ -473,7 +473,7 @@ class npc_spectator : public CreatureScript
if (pointId == 1)
me->GetMotionMaster()->MovePoint(2, spectatorWP[1]);
else if (pointId == 2)
me->DespawnOrUnsummon(1000);
me->DespawnOrUnsummon(1s);
}
}
};
src/server/scripts/Northrend/VioletHold/boss_ichoron.cpp
+1 -1
View File
@@ -271,7 +271,7 @@ class npc_ichor_globule : public CreatureScript
return;
me->CastSpell(me, SPELL_MERGE);
me->DespawnOrUnsummon(1);
me->DespawnOrUnsummon(1ms);
}
// on retail spell casted on a creature's death are not casted after death but keeping mob at 1 health, casting it and then letting the mob die.
src/server/scripts/Northrend/VioletHold/boss_xevozz.cpp
+2 -2
View File
@@ -207,7 +207,7 @@ class npc_ethereal_sphere : public CreatureScript
DoCast(me, SPELL_POWER_BALL_VISUAL);
DoCast(me, DUNGEON_MODE(SPELL_POWER_BALL_DAMAGE_TRIGGER, SPELL_POWER_BALL_DAMAGE_TRIGGER_H));
me->DespawnOrUnsummon(40000);
me->DespawnOrUnsummon(40s);
}
void DoAction(int32 action) override
@@ -233,7 +233,7 @@ class npc_ethereal_sphere : public CreatureScript
if (me->IsWithinDist(xevozz, 3.0f))
{
DoCastAOE(SPELL_ARCANE_POWER);
me->DespawnOrUnsummon(8000);
me->DespawnOrUnsummon(8s);
return;
}
}
src/server/scripts/Northrend/VioletHold/violet_hold.cpp
+2 -2
View File
@@ -598,7 +598,7 @@ class npc_azure_saboteur : public CreatureScript
{
_instance->SetData(DATA_START_BOSS_ENCOUNTER, 1);
me->CastSpell(me, SPELL_TELEPORT_VISUAL, false);
me->DespawnOrUnsummon(1000);
me->DespawnOrUnsummon(1s);
});
}
});
@@ -1268,7 +1268,7 @@ class npc_violet_hold_defense_system : public CreatureScript
void Reset() override
{
ScheduledTasks();
me->DespawnOrUnsummon(7000);
me->DespawnOrUnsummon(7s);
}
void ScheduledTasks()
src/server/scripts/Northrend/zone_dragonblight.cpp
+2 -2
View File
@@ -407,7 +407,7 @@ public:
{
tree->CastSpell(player, SPELL_CREATE_ITEM_BARK);
tree->AI()->Talk(SAY_WALKER_FRIENDLY, player);
tree->DespawnOrUnsummon(1000);
tree->DespawnOrUnsummon(1s);
}
else // enemy version
{
@@ -446,7 +446,7 @@ public:
lothalor->AI()->Talk(SAY_LOTHALOR);
lothalor->RemoveAura(SPELL_CONFUSED);
lothalor->DespawnOrUnsummon(4000);
lothalor->DespawnOrUnsummon(4s);
}
void Register() override
src/server/scripts/Northrend/zone_grizzly_hills.cpp
+4 -4
View File
@@ -485,7 +485,7 @@ public:
void Initialize()
{
_despawnTimer = 5000;
_despawnTimer = 5s;
}
void Reset() override
@@ -527,7 +527,7 @@ public:
DoMeleeAttackIfReady();
}
private:
uint32 _despawnTimer;
Milliseconds _despawnTimer;
};
CreatureAI* GetAI(Creature* creature) const override
@@ -709,7 +709,7 @@ public:
{
if (_following)
if (!me->HasAura(SPELL_FROG_LOVE))
me->DespawnOrUnsummon(1000);
me->DespawnOrUnsummon(1s);
_events.Update(diff);
@@ -736,7 +736,7 @@ public:
break;
case EVENT_LAKEFROG_5:
Talk(SAY_MAIDEN_1);
me->DespawnOrUnsummon(4000);
me->DespawnOrUnsummon(4s);
break;
default:
break;
src/server/scripts/Northrend/zone_icecrown.cpp
+1 -1
View File
@@ -79,7 +79,7 @@ public:
uiDamage = 0;
pDoneBy->CastSpell(pDoneBy, SPELL_KILL_CREDIT, true);
me->SetFaction(FACTION_FRIENDLY);
me->DespawnOrUnsummon(5000);
me->DespawnOrUnsummon(5s);
me->SetHomePosition(me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation());
EnterEvadeMode();
}
src/server/scripts/Northrend/zone_zuldrak.cpp
+3 -3
View File
@@ -153,7 +153,7 @@ public:
DoCast(me, SPELL_UNSHACKLED, true);
Talk(SAY_RAGECLAW);
me->GetMotionMaster()->MoveRandom(10);
me->DespawnOrUnsummon(10000);
me->DespawnOrUnsummon(10s);
}
}
};
@@ -257,7 +257,7 @@ public:
case EVENT_RECRUIT_2:
me->SetWalk(true);
me->GetMotionMaster()->MovePoint(0, me->GetPositionX() + (std::cos(_heading) * 10), me->GetPositionY() + (std::sin(_heading) * 10), me->GetPositionZ());
me->DespawnOrUnsummon(5000);
me->DespawnOrUnsummon(5s);
break;
default:
break;
@@ -318,7 +318,7 @@ public:
{
player->KilledMonsterCredit(gymerDummy->GetEntry(), gymerDummy->GetGUID());
gymerDummy->CastSpell(gymerDummy, SPELL_GYMER_LOCK_EXPLOSION, true);
gymerDummy->DespawnOrUnsummon(4 * IN_MILLISECONDS);
gymerDummy->DespawnOrUnsummon(4s);
}
}
return true;