public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 07:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Scripts/Misc): Fix bosses not reseting after the despawn update (#15507)

Browse Source 
* fix bosses not reseting

* fix lk

* fix tirion not respawning

* up
This commit is contained in:
Skjalf
2023-03-21 15:05:04 -03:00
committed by GitHub
parent 80ac0c958d
commit 9aee5c41e2
3 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/sql/updates/pending_db_world/rev_1679368320710232700.sql Normal file
View File

@@ -0,0 +1,2 @@
--
DELETE FROM `creature` WHERE `guid` = 150212;

11
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
View File

@@ -277,6 +277,9 @@ public:
if (IsAnyPlayerValid()) if (IsAnyPlayerValid())
return; return;
instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_HALION_CONTROLLER)))
controller->AI()->DoAction(ACTION_RESET_ENCOUNTER);
BossAI::EnterEvadeMode(why); BossAI::EnterEvadeMode(why);
} }
@@ -286,14 +289,6 @@ public:
BossAI::AttackStart(who); BossAI::AttackStart(who);
} }
void JustReachedHome() override
{
instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me);
if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_HALION_CONTROLLER)))
controller->AI()->DoAction(ACTION_RESET_ENCOUNTER);
BossAI::JustReachedHome();
}
void JustEngagedWith(Unit* who) override void JustEngagedWith(Unit* who) override
{ {
BossAI::JustEngagedWith(who); BossAI::JustEngagedWith(who);

34
src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
View File

@@ -308,6 +308,7 @@ enum Phases
}; };
Position const CenterPosition = {503.6282f, -2124.655f, 840.8569f, 0.0f}; Position const CenterPosition = {503.6282f, -2124.655f, 840.8569f, 0.0f};
Position const TirionSpawn = { 505.2118f, -2124.353f, 840.9403f, 3.141593f };
Position const TirionIntro = {488.2970f, -2124.840f, 840.8569f, 0.0f}; Position const TirionIntro = {488.2970f, -2124.840f, 840.8569f, 0.0f};
Position const TirionCharge = {472.8500f, -2124.350f, 840.8570f, 0.0f}; Position const TirionCharge = {472.8500f, -2124.350f, 840.8570f, 0.0f};
Position const LichKingIntro[3] = { {432.0851f, -2123.673f, 864.6582f, 0.0f}, {457.8351f, -2123.423f, 841.1582f, 0.0f}, {465.0730f, -2123.470f, 840.8569f, 0.0f} }; Position const LichKingIntro[3] = { {432.0851f, -2123.673f, 864.6582f, 0.0f}, {457.8351f, -2123.423f, 841.1582f, 0.0f}, {465.0730f, -2123.470f, 840.8569f, 0.0f} };
@@ -660,6 +661,21 @@ public:
SetEquipmentSlots(true); SetEquipmentSlots(true);
if (me->IsImmuneToPC()) if (me->IsImmuneToPC())
me->SetStandState(UNIT_STAND_STATE_SIT); me->SetStandState(UNIT_STAND_STATE_SIT);
DoAction(ACTION_RESTORE_LIGHT);
// Reset The Frozen Throne gameobjects
FrozenThroneResetWorker reset;
Acore::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset);
Cell::VisitGridObjects(me, worker, 333.0f);
me->AddAura(SPELL_EMOTE_SIT_NO_SHEATH, me);
me->SetImmuneToPC(true);
me->SetReactState(REACT_PASSIVE);
me->SetStandState(UNIT_STAND_STATE_SIT);
if (!ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_HIGHLORD_TIRION_FORDRING)))
me->SummonCreature(NPC_HIGHLORD_TIRION_FORDRING_LK, TirionSpawn, TEMPSUMMON_MANUAL_DESPAWN);
} }
void JustDied(Unit* /*killer*/) override void JustDied(Unit* /*killer*/) override
@@ -693,22 +709,6 @@ public:
events.ScheduleEvent(EVENT_SHADOW_TRAP, 15s + 500ms, EVENT_GROUP_ABILITIES); events.ScheduleEvent(EVENT_SHADOW_TRAP, 15s + 500ms, EVENT_GROUP_ABILITIES);
} }
void JustReachedHome() override
{
_JustReachedHome();
DoAction(ACTION_RESTORE_LIGHT);
// Reset The Frozen Throne gameobjects
FrozenThroneResetWorker reset;
Acore::GameObjectWorker<FrozenThroneResetWorker> worker(me, reset);
Cell::VisitGridObjects(me, worker, 333.0f);
me->AddAura(SPELL_EMOTE_SIT_NO_SHEATH, me);
me->SetImmuneToPC(true);
me->SetReactState(REACT_PASSIVE);
me->SetStandState(UNIT_STAND_STATE_SIT);
}
bool CanAIAttack(Unit const* target) const override bool CanAIAttack(Unit const* target) const override
{ {
return me->IsVisible() && IsValidPlatformTarget(target) && !target->GetVehicle(); return me->IsVisible() && IsValidPlatformTarget(target) && !target->GetVehicle();
@@ -1262,7 +1262,7 @@ public:
me->SetReactState(REACT_AGGRESSIVE); me->SetReactState(REACT_AGGRESSIVE);
if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_HIGHLORD_TIRION_FORDRING))) if (Creature* tirion = ObjectAccessor::GetCreature(*me, instance->GetGuidData(DATA_HIGHLORD_TIRION_FORDRING)))
tirion->AI()->EnterEvadeMode(); tirion->DespawnOrUnsummon();
} }
}; };