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

7 files changed, 14 insertions, 21 deletions

diff --git a/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp b/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp
index 598e705c0eb..669569c2953 100644
--- a/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_dun_morogh_area_coldridge_valley.cpp
@@ -70,7 +70,7 @@ public:
                 {
                     _tapped = true;
                     _playerGUID = caster->GetGUID();
-                    me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC);
+                    me->SetImmuneToNPC(true);
                     me->SetStandState(UNIT_STAND_STATE_STAND);
                     _events.ScheduleEvent(EVENT_TURN_TO_PLAYER, Seconds(2));
                 }
diff --git a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
index 867801feeb9..9d587ec5f94 100644
--- a/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
@@ -3628,8 +3628,7 @@ struct npc_silverpine_mutant_bush_chicken : public ScriptedAI
 
     void JustAppeared() override
     {
-        me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
-        me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC);
+        me->SetImmuneToAll(true);
     }
 
     void IsSummonedBy(WorldObject* summoner) override
@@ -4298,8 +4297,7 @@ struct npc_silverpine_agatha_fenris_isle : public ScriptedAI
                         me->GetMotionMaster()->Clear();
                         me->GetMotionMaster()->MoveFollow(summoner, 3.0f, float(M_PI / 2.0f));
 
-                        me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
-                        me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC);
+                        me->SetImmuneToAll(false);
 
                         me->SetReactState(REACT_ASSIST);
                     }
@@ -4326,8 +4324,7 @@ struct npc_silverpine_agatha_fenris_isle : public ScriptedAI
 
         _isSceneStarted = true;
 
-        me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
-        me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC);
+        me->SetImmuneToAll(false);
 
         me->SetReactState(REACT_PASSIVE);
 
@@ -4575,8 +4572,7 @@ struct npc_silverpine_forsaken_trooper_fenris_isle : public ScriptedAI
         if (!summoner->IsCreature())
             return;
 
-        me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
-        me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC);
+        me->SetImmuneToAll(true);
 
         me->SetReactState(REACT_PASSIVE);
 
@@ -4862,8 +4858,7 @@ struct npc_silverpine_fenris_keep_camera : public ScriptedAI
         if (Unit* unit = summoner->ToUnit())
             unit->EnterVehicle(me, SEAT_FENRIS_CAMERA);
 
-        me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
-        me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC);
+        me->SetImmuneToAll(true);
 
         me->SetReactState(REACT_PASSIVE);
     }
@@ -4982,8 +4977,7 @@ struct npc_silverpine_crowley_bloodfang_fenris_keep : public ScriptedAI
 
     void JustAppeared() override
     {
-        me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
-        me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC);
+        me->SetImmuneToAll(true);
 
         me->SetReactState(REACT_PASSIVE);
     }
@@ -5121,8 +5115,7 @@ struct npc_silverpine_generic_actor_fenris_keep : public ScriptedAI
         if (Creature* fenrisStalker = me->FindNearestCreature(NPC_FENRIS_KEEP_STALKER, 50.0f, true))
             me->SetFacingToObject(fenrisStalker);
 
-        me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
-        me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC);
+        me->SetImmuneToAll(true);
 
         me->SetReactState(REACT_PASSIVE);
     }
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;
         }
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
index 596d9a397fc..8e79ad8dc42 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
@@ -170,7 +170,7 @@ class boss_corborus : public CreatureScript
                             // Face Corborus to players and set new home position
                             me->SetFacingTo(3.176499f);
                             me->SetHomePosition(1154.55f, 878.843f, 284.963f, 3.176499f);
-                            me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
+                            me->SetImmuneToPC(false);
 
                             // Despawn Millhouse and all trash
                             instance->SetData(DATA_MILLHOUSE_EVENT_DESPAWN, 0);
diff --git a/src/server/scripts/Northrend/zone_storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp
index f8f8238e1ab..5009c758586 100644
--- a/src/server/scripts/Northrend/zone_storm_peaks.cpp
+++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp
@@ -783,7 +783,7 @@ struct npc_king_jokkum_vehicle : public VehicleAI
             playerGUID = who->GetGUID();
             Talk(SAY_HOLD_ON, who);
             me->CastSpell(who, SPELL_JOKKUM_KILL_CREDIT, true);
-            me->SetUnitFlag(UNIT_FLAG_IMMUNE_TO_NPC);
+            me->SetImmuneToNPC(true);
             me->GetMotionMaster()->MovePath(PATH_JOKKUM, false);
         }
     }
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index a28c4e9a41d..3cace29b372 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -339,7 +339,7 @@ struct boss_the_lurker_below : public BossAI
 
             if (!Spawned)
             {
-                me->ReplaceAllUnitFlags(UNIT_FLAG_IMMUNE_TO_PC);
+                me->SetImmuneToPC(true, true);
                 // spawn adds
                 for (uint8 i = 0; i < 9; ++i)
                     me->SummonCreature(i < 6 ? NPC_COILFANG_AMBUSHER : NPC_COILFANG_GUARDIAN, AddPos[i][0], AddPos[i][1], AddPos[i][2], 0, TEMPSUMMON_CORPSE_DESPAWN);