feat(Core/Misc): implement ObjectGuid class (port from TC) (#4885)

2026-01-27 07:36:23 +00:00 · 2021-04-25 22:18:03 +02:00
parent 91081f4ad8
commit f4c226423d
568 changed files with 10655 additions and 11019 deletions
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp
@@ -94,7 +94,7 @@ public:
            Talk(YELL_DEATH);

            me->CastSpell(me, SPELL_SUMMON_BRUTALLUS_DEATH_CLOUD, true);
-            if (Creature* madrigosa = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_MADRIGOSA)))
+            if (Creature* madrigosa = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_MADRIGOSA)))
                madrigosa->AI()->DoAction(ACTION_SPAWN_FELMYST);
        }

@@ -230,7 +230,7 @@ public:
            {
                case EVENT_MAD_1:
                    me->SetVisible(true);
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                    {
                        me->SetTarget(brutallus->GetGUID());
                        brutallus->SetReactState(REACT_PASSIVE);
@@ -256,12 +256,12 @@ public:
                    events.ScheduleEvent(EVENT_MAD_4, 7000);
                    break;
                case EVENT_MAD_4:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                        brutallus->AI()->Talk(YELL_INTRO);
                    events.ScheduleEvent(EVENT_MAD_5, 5000);
                    break;
                case EVENT_MAD_5:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                    {
                        brutallus->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_ATTACK1H);
                        me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_ATTACK1H);
@@ -269,7 +269,7 @@ public:
                    events.ScheduleEvent(EVENT_MAD_6, 10000);
                    break;
                case EVENT_MAD_6:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                    {
                        brutallus->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
                        me->SetUInt32Value(UNIT_NPC_EMOTESTATE, EMOTE_ONESHOT_NONE);
@@ -292,11 +292,11 @@ public:
                    events.ScheduleEvent(EVENT_MAD_8, 14000);
                    break;
                case EVENT_MAD_8:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                        me->CastSpell(brutallus, SPELL_MADRIGOSA_FROSTBOLT, false);
                    break;
                case EVENT_MAD_9:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                    {
                        brutallus->CastSpell(brutallus, SPELL_BRUTALLUS_FLAME_RING, true);
                        brutallus->RemoveAllAuras();
@@ -318,7 +318,7 @@ public:
                    events.ScheduleEvent(EVENT_MAD_14, 2000);
                    break;
                case EVENT_MAD_14:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                    {
                        brutallus->SetDisableGravity(true);
                        brutallus->GetMotionMaster()->MovePoint(0, brutallus->GetPositionX(), brutallus->GetPositionY() - 30.0f, brutallus->GetPositionZ() + 15.0f, false, true);
@@ -326,7 +326,7 @@ public:
                    events.ScheduleEvent(EVENT_MAD_15, 10000);
                    break;
                case EVENT_MAD_15:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                    {
                        brutallus->RemoveAllAuras();
                        brutallus->SetDisableGravity(false);
@@ -336,12 +336,12 @@ public:
                    events.ScheduleEvent(EVENT_MAD_16, 1400);
                    break;
                case EVENT_MAD_16:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                        brutallus->CastSpell(me, SPELL_BRUTALLUS_CHARGE, true);
                    events.ScheduleEvent(EVENT_MAD_17, 1200);
                    break;
                case EVENT_MAD_17:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                        brutallus->HandleEmoteCommand(EMOTE_ONESHOT_ATTACK1H);
                    events.ScheduleEvent(EVENT_MAD_18, 500);
                    break;
@@ -352,14 +352,14 @@ public:
                    events.ScheduleEvent(EVENT_MAD_19, 6000);
                    break;
                case EVENT_MAD_19:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                        brutallus->AI()->Talk(YELL_INTRO_KILL_MADRIGOSA);
                    events.ScheduleEvent(EVENT_MAD_20, 7000);
                    break;
                case EVENT_MAD_20:
                    me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
                    me->setFaction(35);
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                    {
                        brutallus->AI()->Talk(YELL_INTRO_TAUNT);
                        brutallus->CastSpell(brutallus, SPELL_BRUTALLUS_BREAK_ICE, false);
@@ -367,7 +367,7 @@ public:
                    events.ScheduleEvent(EVENT_MAD_21, 4000);
                    break;
                case EVENT_MAD_21:
-                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_BRUTALLUS)))
+                    if (Creature* brutallus = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_BRUTALLUS)))
                    {
                        brutallus->SetReactState(REACT_AGGRESSIVE);
                        brutallus->SetHealth(brutallus->GetMaxHealth());
@@ -377,7 +377,7 @@ public:
                    break;
                case EVENT_SPAWN_FELMYST:
                    me->DespawnOrUnsummon(1);
-                    if (Creature* felmyst = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_FELMYST)))
+                    if (Creature* felmyst = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_FELMYST)))
                        felmyst->AI()->DoAction(ACTION_START_EVENT);
                    break;
            }
@@ -517,7 +517,7 @@ public:
            {
                instance->SetBossState(DATA_MADRIGOSA, NOT_STARTED);
                instance->SetBossState(DATA_MADRIGOSA, DONE);
-                if (Creature* creature = ObjectAccessor::GetCreature(*player, instance->GetData64(NPC_MADRIGOSA)))
+                if (Creature* creature = ObjectAccessor::GetCreature(*player, instance->GetGuidData(NPC_MADRIGOSA)))
                    creature->AI()->DoAction(ACTION_START_EVENT);
            }

--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp
@@ -101,7 +101,7 @@ public:
        void EnterEvadeMode() override
        {
            BossAI::EnterEvadeMode();
-            if (Creature* alythess = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_GRAND_WARLOCK_ALYTHESS)))
+            if (Creature* alythess = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_GRAND_WARLOCK_ALYTHESS)))
            {
                if (!alythess->IsAlive())
                    alythess->Respawn(true);
@@ -113,7 +113,7 @@ public:
        void EnterCombat(Unit* who) override
        {
            BossAI::EnterCombat(who);
-            if (Creature* alythess = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_GRAND_WARLOCK_ALYTHESS)))
+            if (Creature* alythess = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_GRAND_WARLOCK_ALYTHESS)))
                if (alythess->IsAlive() && !alythess->IsInCombat())
                    alythess->AI()->AttackStart(who);

@@ -140,7 +140,7 @@ public:
                Talk(YELL_SAC_DEAD);
                instance->SetBossState(DATA_EREDAR_TWINS, DONE);
            }
-            else if (Creature* alythess = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_GRAND_WARLOCK_ALYTHESS)))
+            else if (Creature* alythess = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_GRAND_WARLOCK_ALYTHESS)))
                alythess->AI()->DoAction(ACTION_SISTER_DIED);
        }

@@ -249,7 +249,7 @@ public:
        void EnterEvadeMode() override
        {
            BossAI::EnterEvadeMode();
-            if (Creature* scorlash = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_LADY_SACROLASH)))
+            if (Creature* scorlash = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_LADY_SACROLASH)))
            {
                if (!scorlash->IsAlive())
                    scorlash->Respawn(true);
@@ -261,7 +261,7 @@ public:
        void EnterCombat(Unit* who) override
        {
            BossAI::EnterCombat(who);
-            if (Creature* scorlash = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_LADY_SACROLASH)))
+            if (Creature* scorlash = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_LADY_SACROLASH)))
                if (scorlash->IsAlive() && !scorlash->IsInCombat())
                    scorlash->AI()->AttackStart(who);

@@ -288,7 +288,7 @@ public:
                Talk(YELL_SAC_DEAD);
                instance->SetBossState(DATA_EREDAR_TWINS, DONE);
            }
-            else if (Creature* scorlash = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_LADY_SACROLASH)))
+            else if (Creature* scorlash = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_LADY_SACROLASH)))
                scorlash->AI()->DoAction(ACTION_SISTER_DIED);
        }

@@ -491,9 +491,9 @@ public:
            if (instance->GetBossState(DATA_EREDAR_TWINS_INTRO) != DONE)
            {
                instance->SetBossState(DATA_EREDAR_TWINS_INTRO, DONE);
-                if (Creature* creature = ObjectAccessor::GetCreature(*player, instance->GetData64(NPC_LADY_SACROLASH)))
+                if (Creature* creature = ObjectAccessor::GetCreature(*player, instance->GetGuidData(NPC_LADY_SACROLASH)))
                    creature->AI()->Talk(YELL_INTRO_SAC);
-                if (Creature* creature = ObjectAccessor::GetCreature(*player, instance->GetData64(NPC_GRAND_WARLOCK_ALYTHESS)))
+                if (Creature* creature = ObjectAccessor::GetCreature(*player, instance->GetGuidData(NPC_GRAND_WARLOCK_ALYTHESS)))
                    creature->AI()->Talk(YELL_INTRO_ALY);
            }

--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_felmyst.cpp
@@ -193,7 +193,7 @@ public:
            }
            else if (point == POINT_AIR_BREATH_START1)
            {
-                me->SetTarget(0);
+                me->SetTarget();
                me->SetFacingTo(4.71f);
                events.ScheduleEvent(EVENT_FLIGHT_EMOTE, 2000);
                events.ScheduleEvent(EVENT_CORRUPT_TRIGGERS, 5000);
@@ -208,7 +208,7 @@ public:
            }
            else if (point == POINT_AIR_BREATH_START2)
            {
-                me->SetTarget(0);
+                me->SetTarget();
                me->SetFacingTo(1.57f);
                events.ScheduleEvent(EVENT_FLIGHT_EMOTE, 2000);
                events.ScheduleEvent(EVENT_CORRUPT_TRIGGERS, 5000);
@@ -308,7 +308,7 @@ public:
                    break;
                case EVENT_FLIGHT_SEQ:
                    Talk(YELL_TAKEOFF);
-                    me->SetTarget(0);
+                    me->SetTarget();
                    me->HandleEmoteCommand(EMOTE_ONESHOT_LIFTOFF);
                    me->SetDisableGravity(true);
                    me->SendMovementFlagUpdate();
@@ -534,7 +534,7 @@ public:
            return true;

        Creature* cr = object->ToCreature();
-        return cr->GetDBTableGUIDLow() != 54780 && cr->GetDBTableGUIDLow() != 54787 && cr->GetDBTableGUIDLow() != 54801;
+        return cr->GetSpawnId() != 54780 && cr->GetSpawnId() != 54787 && cr->GetSpawnId() != 54801;
    }
 };

--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -173,7 +173,7 @@ public:
                events.Reset();
                events2.ScheduleEvent(EVENT_TALK_GOOD_1, 1000);
                ClearPlayerAuras();
-                if (Creature* Sath = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_SATHROVARR)))
+                if (Creature* Sath = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_SATHROVARR)))
                {
                    Sath->RemoveAllAuras();
                    Sath->GetMotionMaster()->MovementExpired();
@@ -232,7 +232,7 @@ public:
                    events2.ScheduleEvent(EVENT_TALK_GOOD_2, 1000);
                    break;
                case EVENT_TALK_GOOD_2:
-                    if (Creature* Sath = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_SATHROVARR)))
+                    if (Creature* Sath = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_SATHROVARR)))
                    {
                        summons.Despawn(Sath);
                        Unit::Kill(me, Sath);
@@ -318,7 +318,7 @@ public:
                case EVENT_CHECK_HEALTH:
                    if (me->HealthBelowPct(10))
                    {
-                        if (Creature* Sath = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_SATHROVARR)))
+                        if (Creature* Sath = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_SATHROVARR)))
                            Sath->AI()->DoAction(ACTION_ENRAGE_OTHER);
                        DoAction(ACTION_ENRAGE);
                        break;
@@ -408,7 +408,7 @@ public:
        void JustDied(Unit*) override
        {
            if (InstanceScript* instance = me->GetInstanceScript())
-                if (Creature* kalecgos = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS)))
+                if (Creature* kalecgos = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS)))
                    kalecgos->AI()->DoAction(ACTION_KALEC_DIED);
        }

@@ -577,7 +577,7 @@ public:
                    if (me->HealthBelowPct(10))
                    {
                        if (InstanceScript* instance = me->GetInstanceScript())
-                            if (Creature* kalecgos = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS)))
+                            if (Creature* kalecgos = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS)))
                                kalecgos->AI()->DoAction(ACTION_ENRAGE_OTHER);
                        DoAction(ACTION_ENRAGE);
                        break;
@@ -587,7 +587,7 @@ public:
                case EVENT_CHECK_HEALTH2:
                    if (me->HealthBelowPct(1))
                    {
-                        if (Creature* kalecgos = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS)))
+                        if (Creature* kalecgos = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS)))
                            kalecgos->AI()->DoAction(ACTION_SATH_BANISH);
                        DoAction(ACTION_BANISH);
                        break;
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kiljaeden.cpp
@@ -170,7 +170,7 @@ public:
        void ResetOrbs()
        {
            for (uint8 i = 0; i < 4; ++i)
-                if (GameObject* orb = ObjectAccessor::GetGameObject(*me, instance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1 + i)))
+                if (GameObject* orb = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1 + i)))
                    orb->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
        }

@@ -313,7 +313,7 @@ public:
        {
            if (damage >= me->GetHealth())
            {
-                me->SetTarget(0);
+                me->SetTarget();
                me->SetReactState(REACT_PASSIVE);
                me->RemoveAllAuras();
                me->DeleteThreatList();
@@ -332,7 +332,7 @@ public:
        {
            Talk(SAY_KJ_DEATH);
            instance->SetBossState(DATA_KILJAEDEN, DONE);
-            if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KILJAEDEN_CONTROLLER)))
+            if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KILJAEDEN_CONTROLLER)))
                Unit::Kill(controller, controller);
        }

@@ -392,17 +392,17 @@ public:
                    me->CastSpell(me, SPELL_REBIRTH, false);
                    break;
                case EVENT_EMPOWER_ORBS1:
-                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS_KJ)))
+                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS_KJ)))
                        kalec->AI()->Talk(SAY_KALECGOS_READY1);
                    EmpowerOrb(false);
                    break;
                case EVENT_EMPOWER_ORBS2:
-                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS_KJ)))
+                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS_KJ)))
                        kalec->AI()->Talk(SAY_KALECGOS_READY2);
                    EmpowerOrb(false);
                    break;
                case EVENT_EMPOWER_ORBS3:
-                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS_KJ)))
+                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS_KJ)))
                        kalec->AI()->Talk(SAY_KALECGOS_READY_ALL);
                    EmpowerOrb(true);
                    break;
@@ -412,56 +412,56 @@ public:
                    me->SetInCombatWithZone();
                    return;
                case EVENT_TEXT_SPEACH11:
-                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS_KJ)))
+                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS_KJ)))
                        kalec->AI()->Talk(SAY_KALECGOS_JOIN);
                    break;
                case EVENT_TEXT_SPEACH21:
-                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS_KJ)))
+                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS_KJ)))
                        kalec->AI()->Talk(SAY_KALECGOS_AWAKEN);
                    break;
                case EVENT_TEXT_SPEACH22:
-                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA)))
+                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_ANVEENA)))
                        sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_IMPRISONED, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE);
                    break;
                case EVENT_TEXT_SPEACH23:
                    Talk(SAY_KJ_PHASE3);
                    break;
                case EVENT_TEXT_SPEACH31:
-                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS_KJ)))
+                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS_KJ)))
                        kalec->AI()->Talk(SAY_KALECGOS_LETGO);
                    break;
                case EVENT_TEXT_SPEACH32:
-                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA)))
+                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_ANVEENA)))
                        sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_LOST, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE);
                    break;
                case EVENT_TEXT_SPEACH33:
                    Talk(SAY_KJ_PHASE4);
                    break;
                case EVENT_TEXT_SPEACH41:
-                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS_KJ)))
+                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS_KJ)))
                        kalec->AI()->Talk(SAY_KALECGOS_FOCUS);
                    break;
                case EVENT_TEXT_SPEACH42:
-                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA)))
+                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_ANVEENA)))
                        sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_KALEC, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE);
                    break;
                case EVENT_TEXT_SPEACH43:
-                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KALECGOS_KJ)))
+                    if (Creature* kalec = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KALECGOS_KJ)))
                        kalec->AI()->Talk(SAY_KALECGOS_FATE);
                    break;
                case EVENT_TEXT_SPEACH44:
-                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA)))
+                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_ANVEENA)))
                        sCreatureTextMgr->SendChat(anveena, SAY_ANVEENA_GOODBYE, nullptr, CHAT_MSG_ADDON, LANG_ADDON, TEXT_RANGE_ZONE);
                    break;
                case EVENT_TEXT_SPEACH45:
-                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA)))
+                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_ANVEENA)))
                    {
                        anveena->RemoveAllAuras();
                        anveena->DespawnOrUnsummon(3500);
                    }
                    break;
                case EVENT_TEXT_SPEACH46:
-                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_ANVEENA)))
+                    if (Creature* anveena = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_ANVEENA)))
                    {
                        anveena->CastSpell(anveena, SPELL_SACRIFICE_OF_ANVEENA, true);
                        me->CastSpell(me, SPELL_CUSTOM_08_STATE, true);
@@ -628,7 +628,7 @@ public:
        {
            for (uint8 i = 0; i < 4; ++i)
            {
-                if (GameObject* orb = ObjectAccessor::GetGameObject(*me, instance->GetData64(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1 + i)))
+                if (GameObject* orb = ObjectAccessor::GetGameObject(*me, instance->GetGuidData(DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1 + i)))
                {
                    if (orb->HasFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE))
                    {
@@ -636,7 +636,7 @@ public:
                        if (Creature* trigger = me->SummonTrigger(orb->GetPositionX(), orb->GetPositionY(), orb->GetPositionZ(), 0, 10 * MINUTE * IN_MILLISECONDS))
                        {
                            trigger->CastSpell(trigger, SPELL_RING_OF_BLUE_FLAMES, true, nullptr, nullptr, trigger->GetGUID());
-                            if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_KILJAEDEN_CONTROLLER)))
+                            if (Creature* controller = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_KILJAEDEN_CONTROLLER)))
                                controller->AI()->JustSummoned(trigger);
                        }

--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -166,7 +166,7 @@ public:
        void EnterEvadeMode() override
        {
            if (InstanceScript* instance = me->GetInstanceScript())
-                if (Creature* muru = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_MURU)))
+                if (Creature* muru = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_MURU)))
                    if (!muru->IsInEvadeMode())
                        muru->AI()->EnterEvadeMode();

@@ -195,7 +195,7 @@ public:
        void JustDied(Unit* /*killer*/) override
        {
            if (InstanceScript* instance = me->GetInstanceScript())
-                if (Creature* muru = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_MURU)))
+                if (Creature* muru = ObjectAccessor::GetCreature(*me, instance->GetGuidData(NPC_MURU)))
                    Unit::Kill(muru, muru);
        }

--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -29,22 +29,6 @@ public:
        {
            SetBossNumber(MAX_ENCOUNTERS);
            LoadDoorData(doorData);
-
-            KalecgosDragonGUID          = 0;
-            SathrovarrGUID              = 0;
-            BrutallusGUID               = 0;
-            MadrigosaGUID               = 0;
-            FelmystGUID                 = 0;
-            AlythessGUID                = 0;
-            SacrolashGUID               = 0;
-            MuruGUID                    = 0;
-            KilJaedenGUID               = 0;
-            KilJaedenControllerGUID     = 0;
-            AnveenaGUID                 = 0;
-            KalecgosKjGUID              = 0;
-
-            IceBarrierGUID              = 0;
-            memset(&blueFlightOrbGUID, 0, sizeof(blueFlightOrbGUID));
        }

        void OnPlayerEnter(Player* player) override
@@ -64,7 +48,7 @@ public:
                for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                {
                    Player* player = itr->GetSource();
-                    if (player && !player->HasAura(45839, 0))
+                    if (player && !player->HasAura(45839))
                        return player;
                }
            }
@@ -76,7 +60,7 @@ public:

        void OnCreatureCreate(Creature* creature) override
        {
-            if (creature->GetDBTableGUIDLow() > 0 || !IS_PLAYER_GUID(creature->GetOwnerGUID()))
+            if (creature->GetSpawnId() > 0 || !creature->GetOwnerGUID().IsPlayer())
                creature->CastSpell(creature, SPELL_SUNWELL_RADIANCE, true);

            switch (creature->GetEntry())
@@ -196,7 +180,7 @@ public:
            }
        }

-        uint64 GetData64(uint32 id) const override
+        ObjectGuid GetGuidData(uint32 id) const override
        {
            switch (id)
            {
@@ -232,7 +216,8 @@ public:
                case DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_4:
                    return blueFlightOrbGUID[id - DATA_ORB_OF_THE_BLUE_DRAGONFLIGHT_1];
            }
-            return 0;
+
+            return ObjectGuid::Empty;
        }

        std::string GetSaveData() override
@@ -279,21 +264,21 @@ public:
        }

    protected:
-        uint64 KalecgosDragonGUID;
-        uint64 SathrovarrGUID;
-        uint64 BrutallusGUID;
-        uint64 MadrigosaGUID;
-        uint64 FelmystGUID;
-        uint64 AlythessGUID;
-        uint64 SacrolashGUID;
-        uint64 MuruGUID;
-        uint64 KilJaedenGUID;
-        uint64 KilJaedenControllerGUID;
-        uint64 AnveenaGUID;
-        uint64 KalecgosKjGUID;
+        ObjectGuid KalecgosDragonGUID;
+        ObjectGuid SathrovarrGUID;
+        ObjectGuid BrutallusGUID;
+        ObjectGuid MadrigosaGUID;
+        ObjectGuid FelmystGUID;
+        ObjectGuid AlythessGUID;
+        ObjectGuid SacrolashGUID;
+        ObjectGuid MuruGUID;
+        ObjectGuid KilJaedenGUID;
+        ObjectGuid KilJaedenControllerGUID;
+        ObjectGuid AnveenaGUID;
+        ObjectGuid KalecgosKjGUID;

-        uint64 IceBarrierGUID;
-        uint64 blueFlightOrbGUID[4];
+        ObjectGuid IceBarrierGUID;
+        ObjectGuid blueFlightOrbGUID[4];
    };

    InstanceScript* GetInstanceScript(InstanceMap* map) const override