Core/PacketIO: Rewrite updatefield handling

5 files changed, 41 insertions, 41 deletions

diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 7a98eab4066..d136a7c2db4 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -135,11 +135,11 @@ class boss_alar : public CreatureScript
 
                 me->SetDisplayId(me->GetNativeDisplayId());
                 me->SetSpeedRate(MOVE_RUN, DefaultMoveSpeedRate);
-                //me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
-                //me->SetFloatValue(UNIT_FIELD_COMBATREACH, 10);
+                //me->SetBoundingRadius(10);
+                //me->SetCombatReach(10);
                 me->ApplySpellImmune(0, IMMUNITY_SCHOOL, SPELL_SCHOOL_MASK_FIRE, true);
                 me->SetDisableGravity(true);
-                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                 me->setActive(false);
             }
 
@@ -179,7 +179,7 @@ class boss_alar : public CreatureScript
                         me->SetHealth(0);
                         me->InterruptNonMeleeSpells(true);
                         me->RemoveAllAuras();
-                        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                        me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                         me->AttackStop();
                         me->SetTarget(ObjectGuid::Empty);
                         me->SetSpeedRate(MOVE_RUN, 5.0f);
@@ -266,7 +266,7 @@ class boss_alar : public CreatureScript
                                 me->SetStandState(UNIT_STAND_STATE_STAND);
                                 me->SetFullHealth();
                                 me->SetSpeedRate(MOVE_RUN, DefaultMoveSpeedRate);
-                                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                                me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                                 DoZoneInCombat();
                                 DoCast(me, SPELL_REBIRTH, true);
                                 MeltArmor_Timer = 60000;
@@ -307,8 +307,8 @@ class boss_alar : public CreatureScript
                             case WE_SUMMON:
                                 for (uint8 i = 0; i < 2; ++i)
                                     DoSpawnCreature(CREATURE_EMBER_OF_ALAR, 0, 0, 0, 0, TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 5000);
-                                me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 10);
-                                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                                me->SetBoundingRadius(10);
+                                me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                                 me->SetDisplayId(me->GetNativeDisplayId());
                                 DoCast(me, SPELL_REBIRTH_2, true);
                                 break;
@@ -391,8 +391,8 @@ class boss_alar : public CreatureScript
                     {
                         me->AttackStop();
                         me->GetMotionMaster()->MovePoint(6, waypoint[4][0], waypoint[4][1], waypoint[4][2]);
-                        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                        me->SetFloatValue(UNIT_FIELD_BOUNDINGRADIUS, 50);
+                        me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
+                        me->SetBoundingRadius(50);
                         WaitEvent = WE_METEOR;
                         WaitTimer = 0;
                         DiveBomb_Timer = 40000 + rand32() % 5000;
@@ -408,7 +408,7 @@ class boss_alar : public CreatureScript
                             Creature* Summoned = me->SummonCreature(CREATURE_FLAME_PATCH_ALAR, target->GetPositionX(), target->GetPositionY(), target->GetPositionZ(), 0, TEMPSUMMON_TIMED_DESPAWN, 120000);
                             if (Summoned)
                             {
-                                Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                                Summoned->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                                 Summoned->SetObjectScale(Summoned->GetObjectScale() * 2.5f);
                                 Summoned->SetDisplayId(11686);
                                 Summoned->setFaction(me->getFaction());
@@ -501,7 +501,7 @@ class npc_ember_of_alar : public CreatureScript
                     damage = 0;
                     DoCast(me, SPELL_EMBER_BLAST, true);
                     me->SetDisplayId(11686);
-                    me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                     if (instance->GetBossState(DATA_ALAR) == IN_PROGRESS)
                     {
                         if (Unit* Alar = ObjectAccessor::GetUnit(*me, instance->GetGuidData(DATA_ALAR)))
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index 9e2b7ebd5b9..9adea2414a8 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -151,7 +151,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                 Initialize();
                 _Reset();
                 me->SetArmor(defaultarmor, 0);
-                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                 me->SetVisible(true);
                 me->SetObjectScale(defaultsize);
                 me->SetDisplayId(MODEL_HUMAN);
@@ -217,7 +217,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                         AppearDelay = false;
                         if (Phase == 2)
                         {
-                            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                            me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                             me->SetVisible(false);
                         }
                         AppearDelay_Timer = 2000;
@@ -320,7 +320,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                         {
                             if (Creature* Summoned = me->SummonCreature(NPC_ASTROMANCER_SOLARIAN_SPOTLIGHT, Portals[i][0], Portals[i][1], Portals[i][2], CENTER_O, TEMPSUMMON_TIMED_DESPAWN, Phase2_Timer+Phase3_Timer+AppearDelay_Timer+1700))
                             {
-                                Summoned->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                                Summoned->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                                 Summoned->CastSpell(Summoned, SPELL_SPOTLIGHT, false);
                             }
                         }
@@ -364,7 +364,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                             if (j != i)
                                 SummonMinion(NPC_SOLARIUM_PRIEST, Portals[j][0], Portals[j][1], Portals[j][2]);
 
-                        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                         me->SetVisible(true);
 
                         Talk(SAY_SUMMON2);
@@ -399,7 +399,7 @@ class boss_high_astromancer_solarian : public CreatureScript
                 {
                     Phase = 4;
                     //To make sure she wont be invisible or not selecatble
-                    me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                    me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                     me->SetVisible(true);
                     Talk(SAY_VOIDA);
                     Talk(SAY_VOIDB);
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 0d3628c25d3..c0ba5e9b2bf 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -333,8 +333,8 @@ struct advisorbase_ai : public ScriptedAI
         Initialize();
 
         me->SetStandState(UNIT_STAND_STATE_STAND);
-        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
-        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
+        me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
+        me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED));
 
         //reset encounter
         if (instance->GetBossState(DATA_KAELTHAS) == IN_PROGRESS)
@@ -344,7 +344,7 @@ struct advisorbase_ai : public ScriptedAI
 
     void MoveInLineOfSight(Unit* who) override
     {
-        if (!who || _inFakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (!who || _inFakeDeath || me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::MoveInLineOfSight(who);
@@ -352,7 +352,7 @@ struct advisorbase_ai : public ScriptedAI
 
     void AttackStart(Unit* who) override
     {
-        if (!who || _inFakeDeath || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+        if (!who || _inFakeDeath || me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
             return;
 
         ScriptedAI::AttackStart(who);
@@ -363,7 +363,7 @@ struct advisorbase_ai : public ScriptedAI
         if (spell->Id == SPELL_RESSURECTION)
         {
             _hasRessurrected = true;
-            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
+            me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED));
             me->SetStandState(UNIT_STAND_STATE_STAND);
             events.ScheduleEvent(EVENT_DELAYED_RESSURECTION, 2000);
         }
@@ -382,7 +382,7 @@ struct advisorbase_ai : public ScriptedAI
             me->RemoveAllAurasOnDeath();
             me->ModifyAuraState(AURA_STATE_HEALTHLESS_20_PERCENT, false);
             me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
-            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED);
+            me->AddUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_STUNNED));
             me->SetTarget(ObjectGuid::Empty);
             me->SetStandState(UNIT_STAND_STATE_DEAD);
             me->GetMotionMaster()->Clear();
@@ -454,8 +454,8 @@ class boss_kaelthas : public CreatureScript
             {
                 Initialize();
                 DoAction(ACTION_PREPARE_ADVISORS);
-                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
-                me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
+                me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
+                me->SetEmoteState(EMOTE_ONESHOT_NONE);
                 me->SetDisableGravity(false);
                 me->SetTarget(ObjectGuid::Empty);
                 me->SetObjectScale(1.0f);
@@ -483,7 +483,7 @@ class boss_kaelthas : public CreatureScript
                 {
                     case ACTION_START_ENCOUNTER:
                         Talk(SAY_INTRO);
-                        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
 
                         _advisorGuid[ADVISOR_THALADRED] = instance->GetGuidData(DATA_THALADREDTHEDARKENER);
                         _advisorGuid[ADVISOR_SANGUINAR] = instance->GetGuidData(DATA_LORDSANGUINAR);
@@ -500,7 +500,7 @@ class boss_kaelthas : public CreatureScript
                             if (Creature* creature = ObjectAccessor::GetCreature(*me, _advisorGuid[i]))
                             {
                                 creature->Respawn(true);
-                                creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                                creature->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                                 creature->AI()->EnterEvadeMode();
                             }
                         }
@@ -600,7 +600,7 @@ class boss_kaelthas : public CreatureScript
                     case POINT_TRANSITION_CENTER_ASCENDING:
                         me->SetFacingTo(float(M_PI), true);
                         Talk(SAY_PHASE5_NUTS);
-                        me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                         me->SetDisableGravity(true);
                         //me->SetHover(true); -- Set in sniffs, but breaks his visual.
                         events.ScheduleEvent(EVENT_TRANSITION_2, 2000);
@@ -619,7 +619,7 @@ class boss_kaelthas : public CreatureScript
                     case POINT_END_TRANSITION:
                         me->SetReactState(REACT_AGGRESSIVE);
                         me->InterruptNonMeleeSpells(false);
-                        me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                        me->RemoveUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                         me->RemoveAurasDueToSpell(SPELL_FULLPOWER);
 
                         if (Unit* target = SelectTarget(SELECT_TARGET_TOPAGGRO, 0))
@@ -673,13 +673,13 @@ class boss_kaelthas : public CreatureScript
                     switch (eventId)
                     {
                         case EVENT_START_ENCOUNTER:
-                            me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_PACIFIED);
+                            me->AddUnitFlag(UNIT_FLAG_PACIFIED);
                             DoAction(ACTION_ACTIVE_ADVISOR);
                             break;
                         case EVENT_ACTIVE_ADVISOR:
                             if (Creature* advisor = ObjectAccessor::GetCreature(*me, _advisorGuid[_advisorCounter]))
                             {
-                                advisor->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                                advisor->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
 
                                 if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                     advisor->AI()->AttackStart(target);
@@ -709,7 +709,7 @@ class boss_kaelthas : public CreatureScript
                             // Sometimes people can collect Aggro in Phase 1-3. Reset threat before releasing Kael.
                             DoResetThreat();
 
-                            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED);
+                            me->RemoveUnitFlag(UnitFlags(UNIT_FLAG_NOT_SELECTABLE | UNIT_FLAG_PACIFIED));
 
                             if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0))
                                 AttackStart(target);
@@ -742,7 +742,7 @@ class boss_kaelthas : public CreatureScript
                             events.ScheduleEvent(EVENT_SUMMON_PHOENIX, urand(45000, 60000), EVENT_GROUP_COMBAT, PHASE_COMBAT);
                             break;
                         case EVENT_END_TRANSITION:
-                            me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
+                            me->SetEmoteState(EMOTE_ONESHOT_NONE);
                             DoCast(SPELL_FULLPOWER);
                             events.ScheduleEvent(EVENT_TRANSITION_4, 2000);
                             break;
@@ -807,7 +807,7 @@ class boss_kaelthas : public CreatureScript
                             me->RemoveAurasDueToSpell(SPELL_NETHER_BEAM_VISUAL3);
                             DoCast(me, SPELL_KAEL_EXPLODES3, true);
                             DoCast(me, SPELL_KAEL_STUNNED); // Core doesn't handle the emote properly while flying.
-                            me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_STATE_DROWNED);
+                            me->SetEmoteState(EMOTE_STATE_DROWNED);
 
                             // Destroy the surrounding environment.
                             if (GameObject* statue = instance->GetGameObject(DATA_KAEL_STATUE_LEFT))
@@ -1085,7 +1085,7 @@ class boss_grand_astromancer_capernian : public CreatureScript
 
             void AttackStart(Unit* who) override
             {
-                if (!who || me->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE))
+                if (!who || me->HasUnitFlag(UNIT_FLAG_NON_ATTACKABLE))
                     return;
 
                 if (me->Attack(who, true))
@@ -1278,7 +1278,7 @@ class npc_kael_flamestrike : public CreatureScript
             {
                 Initialize();
 
-                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
                 me->setFaction(14);
             }
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 53e8527f5e0..cf285ebb1c4 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -304,7 +304,7 @@ class npc_warden_mellichar : public CreatureScript
             {
                 Initialize();
 
-                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                me->AddUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
                 DoCast(me, SPELL_TARGET_OMEGA);
 
                 instance->SetBossState(DATA_HARBINGER_SKYRISS, NOT_STARTED);
@@ -539,9 +539,9 @@ class npc_zerekethvoidzone : public CreatureScript
 
             void Reset() override
             {
-                me->SetUInt32Value(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_NONE);
+                me->SetNpcFlags(UNIT_NPC_FLAG_NONE);
                 me->setFaction(16);
-                me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
+                me->AddUnitFlag(UNIT_FLAG_NOT_SELECTABLE);
 
                 DoCast(me, SPELL_VOID_ZONE_DAMAGE);
             }
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
index b573d61a1fb..82cf63526c5 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/boss_harbinger_skyriss.cpp
@@ -100,7 +100,7 @@ class boss_harbinger_skyriss : public CreatureScript
             void Reset() override
             {
                 if (!Intro)
-                    me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
+                    me->AddUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
 
                 Initialize();
             }
@@ -183,7 +183,7 @@ class boss_harbinger_skyriss : public CreatureScript
                             Intro_Timer = 3000;
                             break;
                         case 3:
-                            me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC);
+                            me->RemoveUnitFlag(UNIT_FLAG_IMMUNE_TO_PC);
                             Intro = true;
                             break;
                         }
@@ -287,7 +287,7 @@ class boss_harbinger_skyriss_illusion : public CreatureScript
 
             void Reset() override
             {
-                me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
+                me->RemoveUnitFlag(UNIT_FLAG_NON_ATTACKABLE);
             }
 
             void EnterCombat(Unit* /*who*/) override { }