flygard/flygard-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Scripts/Ulduar): FL no longer stuck in combat with empty vehicles (#27348)

Browse source
This commit is contained in:
sogladev 2026-08-27 11:48:39 +02:00 committed by GitHub
parent bb238eea97
commit 8b246aa730
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
View file

@ -123,6 +123,7 @@ enum Events
EVENT_THORIMS_HAMMER = 9, EVENT_THORIMS_HAMMER = 9,
EVENT_SOUND_BEGINNING = 10, EVENT_SOUND_BEGINNING = 10,
EVENT_EJECT_PLAYERS = 11, EVENT_EJECT_PLAYERS = 11,
EVENT_CHECK_PLAYERS = 12,
}; };
enum Texts enum Texts
@ -210,6 +211,17 @@ struct boss_flame_leviathan : public BossAI
void ScheduleEvents(); void ScheduleEvents();
void SummonTowerHelpers(uint8 towerId); void SummonTowerHelpers(uint8 towerId);
bool IsInCombatWithPlayer() const
{
return std::ranges::any_of(me->GetCombatManager().GetPvECombatRefs(),
[this](CombatReference* ref)
{
Player* player = ref->GetOther(me)->GetCharmerOrOwnerPlayerOrPlayerItself();
return player && player->IsAlive();
},
[](auto const& entry) { return entry.second; });
}
void JustReachedHome() override void JustReachedHome() override
{ {
_JustReachedHome(); _JustReachedHome();
@ -432,6 +444,13 @@ struct boss_flame_leviathan : public BossAI
if (Unit* player = seatVehicle->GetPassenger(SEAT_PLAYER)) if (Unit* player = seatVehicle->GetPassenger(SEAT_PLAYER))
player->ExitVehicle(); player->ExitVehicle();
return; return;
case EVENT_CHECK_PLAYERS:
// Empty vehicles keep the boss in combat
if (me->IsInCombat() && !IsInCombatWithPlayer())
EnterEvadeMode(EVADE_REASON_NO_HOSTILES);
else
events.Repeat(5s);
return;
} }
if (me->isAttackReady() && !me->HasUnitState(UNIT_STATE_STUNNED)) if (me->isAttackReady() && !me->HasUnitState(UNIT_STATE_STUNNED))
@ -552,6 +571,7 @@ void boss_flame_leviathan::TurnHealStations(bool _apply)
void boss_flame_leviathan::ScheduleEvents() void boss_flame_leviathan::ScheduleEvents()
{ {
events.RescheduleEvent(EVENT_CHECK_PLAYERS, 5s);
events.RescheduleEvent(EVENT_MISSILE, 5s); events.RescheduleEvent(EVENT_MISSILE, 5s);
events.RescheduleEvent(EVENT_VENT, 20s); events.RescheduleEvent(EVENT_VENT, 20s);
events.RescheduleEvent(EVENT_SPEED, 15s); events.RescheduleEvent(EVENT_SPEED, 15s);