From 03c575b614a8a3ade01f449bf4c89331dfe3c38a Mon Sep 17 00:00:00 2001 From: Shauren Date: Sun, 29 Dec 2024 12:59:38 +0100 Subject: Scripts: Remove direct unit flag manipulations for UNIT_FLAG_IMMUNE_TO_PC, UNIT_FLAG_IMMUNE_TO_NPC and UNIT_FLAG_UNINTERACTIBLE (cherry picked from commit 5e541de5747b26270da90d0d3c60de96a518a5b9) # Conflicts: # src/server/scripts/DragonIsles/AzureVault/boss_leymor.cpp # src/server/scripts/ExilesReach/zone_exiles_reach.cpp # src/server/scripts/KhazAlgar/IsleOfDorn/zone_isle_of_dorn.cpp # src/server/scripts/Pandaria/zone_the_wandering_isle.cpp # src/server/scripts/Zandalar/KingsRest/boss_golden_serpent.cpp --- src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw.cpp | 4 ++-- src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts/Kalimdor') diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw.cpp index 1b235ebed4c..87ae42bf546 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw.cpp @@ -391,7 +391,7 @@ struct npc_lockmaw_augh_boss : public ScriptedAI if (_instance->GetData(DATA_HEROIC_AUGH_DESPAWNED)) me->Relocate(AughRespawnPosition); else - me->SetUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUninteractible(true); me->SetReactState(REACT_PASSIVE); } @@ -457,7 +457,7 @@ struct npc_lockmaw_augh_boss : public ScriptedAI _events.ScheduleEvent(EVENT_TURN_ATTACKABLE, 3s + 500ms, 0, PHASE_INTRO); break; case EVENT_TURN_ATTACKABLE: - me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUninteractible(false); _events.ScheduleEvent(EVENT_SAY_INTRO_3, 11s, 0, PHASE_INTRO); break; case EVENT_SAY_INTRO_3: diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp index e7d9643ca11..de5004c8fff 100644 --- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp +++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp @@ -115,7 +115,7 @@ struct npc_vp_slipstream : public NullCreatureAI if (slipstreamInfo.SpellClick) { me->SetNpcFlag(UNIT_NPC_FLAG_SPELLCLICK); - me->RemoveUnitFlag(UNIT_FLAG_UNINTERACTIBLE); + me->SetUninteractible(false); } break; } -- cgit v1.2.3