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

2 files changed, 8 insertions, 15 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);
     }