Core/Entities: Use ObjectGuid class in game project

40 files changed, 306 insertions, 561 deletions

diff --git a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
index 651e487522d..c8717a73f16 100644
--- a/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
+++ b/src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp
@@ -65,7 +65,7 @@ public:
 
         void Initialize()
         {
-            WaterElementalGUID = 0;
+            WaterElementalGUID.Clear();
             HasCastIceblock = false;
         }
 
@@ -177,7 +177,7 @@ public:
     private:
         EventMap events;
         SummonList summons;
-        uint64 WaterElementalGUID;
+        ObjectGuid WaterElementalGUID;
         bool HasCastIceblock;
     };
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
index 51ca327738b..95f29879f6c 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.cpp
@@ -138,9 +138,9 @@ public:
             MobDeath_Timer = 0;
 
             for (uint8 i = 0; i < MAX_NPC_AMOUNT; ++i)
-                RingMobGUID[i] = 0;
+                RingMobGUID[i].Clear();
 
-            RingBossGUID = 0;
+            RingBossGUID.Clear();
 
             CanWalk = false;
         }
@@ -154,8 +154,8 @@ public:
         uint8 MobCount;
         uint32 MobDeath_Timer;
 
-        uint64 RingMobGUID[4];
-        uint64 RingBossGUID;
+        ObjectGuid RingMobGUID[4];
+        ObjectGuid RingBossGUID;
 
         bool CanWalk;
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
index 67219a2990a..a7a3c5a0350 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
@@ -81,37 +81,37 @@ public:
         uint32 encounter[MAX_ENCOUNTER];
         std::string str_data;
 
-        uint64 EmperorGUID;
-        uint64 PhalanxGUID;
-        uint64 MagmusGUID;
-        uint64 MoiraGUID;
-
-        uint64 GoArena1GUID;
-        uint64 GoArena2GUID;
-        uint64 GoArena3GUID;
-        uint64 GoArena4GUID;
-        uint64 GoShadowLockGUID;
-        uint64 GoShadowMechGUID;
-        uint64 GoShadowGiantGUID;
-        uint64 GoShadowDummyGUID;
-        uint64 GoBarKegGUID;
-        uint64 GoBarKegTrapGUID;
-        uint64 GoBarDoorGUID;
-        uint64 GoTombEnterGUID;
-        uint64 GoTombExitGUID;
-        uint64 GoLyceumGUID;
-        uint64 GoSFSGUID;
-        uint64 GoSFNGUID;
-        uint64 GoGolemNGUID;
-        uint64 GoGolemSGUID;
-        uint64 GoThroneGUID;
-        uint64 GoChestGUID;
-        uint64 GoSpectralChaliceGUID;
+        ObjectGuid EmperorGUID;
+        ObjectGuid PhalanxGUID;
+        ObjectGuid MagmusGUID;
+        ObjectGuid MoiraGUID;
+
+        ObjectGuid GoArena1GUID;
+        ObjectGuid GoArena2GUID;
+        ObjectGuid GoArena3GUID;
+        ObjectGuid GoArena4GUID;
+        ObjectGuid GoShadowLockGUID;
+        ObjectGuid GoShadowMechGUID;
+        ObjectGuid GoShadowGiantGUID;
+        ObjectGuid GoShadowDummyGUID;
+        ObjectGuid GoBarKegGUID;
+        ObjectGuid GoBarKegTrapGUID;
+        ObjectGuid GoBarDoorGUID;
+        ObjectGuid GoTombEnterGUID;
+        ObjectGuid GoTombExitGUID;
+        ObjectGuid GoLyceumGUID;
+        ObjectGuid GoSFSGUID;
+        ObjectGuid GoSFNGUID;
+        ObjectGuid GoGolemNGUID;
+        ObjectGuid GoGolemSGUID;
+        ObjectGuid GoThroneGUID;
+        ObjectGuid GoChestGUID;
+        ObjectGuid GoSpectralChaliceGUID;
 
         uint32 BarAleCount;
         uint32 GhostKillCount;
-        uint64 TombBossGUIDs[7];
-        uint64 TombEventStarterGUID;
+        ObjectGuid TombBossGUIDs[7];
+        ObjectGuid TombEventStarterGUID;
         uint32 TombTimer;
         uint32 TombEventCounter;
 
@@ -120,41 +120,10 @@ public:
             SetHeaders(DataHeader);
             memset(&encounter, 0, sizeof(encounter));
 
-            EmperorGUID = 0;
-            PhalanxGUID = 0;
-            MagmusGUID = 0;
-            MoiraGUID = 0;
-
-            GoArena1GUID = 0;
-            GoArena2GUID = 0;
-            GoArena3GUID = 0;
-            GoArena4GUID = 0;
-            GoShadowLockGUID = 0;
-            GoShadowMechGUID = 0;
-            GoShadowGiantGUID = 0;
-            GoShadowDummyGUID = 0;
-            GoBarKegGUID = 0;
-            GoBarKegTrapGUID = 0;
-            GoBarDoorGUID = 0;
-            GoTombEnterGUID = 0;
-            GoTombExitGUID = 0;
-            GoLyceumGUID = 0;
-            GoSFSGUID = 0;
-            GoSFNGUID = 0;
-            GoGolemNGUID = 0;
-            GoGolemSGUID = 0;
-            GoThroneGUID = 0;
-            GoChestGUID = 0;
-            GoSpectralChaliceGUID = 0;
-
             BarAleCount = 0;
             GhostKillCount = 0;
-            TombEventStarterGUID = 0;
             TombTimer = TIMER_TOMBOFTHESEVEN;
             TombEventCounter = 0;
-
-            for (uint8 i = 0; i < 7; ++i)
-                TombBossGUIDs[i] = 0;
         }
 
         void OnCreatureCreate(Creature* creature) override
@@ -409,7 +378,7 @@ public:
                 }
             }
             GhostKillCount = 0;
-            TombEventStarterGUID = 0;
+            TombEventStarterGUID.Clear();
             TombEventCounter = 0;
             TombTimer = TIMER_TOMBOFTHESEVEN;
             SetData(TYPE_TOMB_OF_SEVEN, NOT_STARTED);
@@ -427,7 +396,7 @@ public:
             DoRespawnGameObject(GoChestGUID, DAY);
             HandleGameObject(GoTombExitGUID, true);//event done, open exit door
             HandleGameObject(GoTombEnterGUID, true);//event done, open entrance door
-            TombEventStarterGUID = 0;
+            TombEventStarterGUID.Clear();
             SetData(TYPE_TOMB_OF_SEVEN, DONE);
         }
         void Update(uint32 diff) override
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
index 94bf3e991f4..2018f12b613 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp
@@ -167,16 +167,16 @@ public:
         boss_rend_blackhandAI(Creature* creature) : BossAI(creature, DATA_WARCHIEF_REND_BLACKHAND)
         {
             gythEvent = false;
-            victorGUID = 0;
-            portcullisGUID = 0;
+            victorGUID.Clear();
+            portcullisGUID.Clear();
         }
 
         void Reset() override
         {
             _Reset();
             gythEvent = false;
-            victorGUID = 0;
-            portcullisGUID = 0;
+            victorGUID.Clear();
+            portcullisGUID.Clear();
         }
 
         void EnterCombat(Unit* /*who*/) override
@@ -437,8 +437,8 @@ public:
 
         private:
             bool   gythEvent;
-            uint64 victorGUID;
-            uint64 portcullisGUID;
+            ObjectGuid victorGUID;
+            ObjectGuid portcullisGUID;
     };
 
     CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
index e95fb8da42e..8243622a2af 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -52,29 +52,6 @@ public:
         {
             SetHeaders(DataHeader);
             SetBossNumber(EncounterCount);
-            HighlordOmokk             = 0;
-            ShadowHunterVoshgajin     = 0;
-            WarMasterVoone            = 0;
-            MotherSmolderweb          = 0;
-            UrokDoomhowl              = 0;
-            QuartermasterZigris       = 0;
-            GizrultheSlavener         = 0;
-            Halycon                   = 0;
-            OverlordWyrmthalak        = 0;
-            PyroguardEmberseer        = 0;
-            WarchiefRendBlackhand     = 0;
-            Gyth                      = 0;
-            LordVictorNefarius        = 0;
-            TheBeast                  = 0;
-            GeneralDrakkisath         = 0;
-            go_emberseerin            = 0;
-            go_doors                  = 0;
-            go_emberseerout           = 0;
-            go_blackrockaltar         = 0;
-            go_portcullis_active      = 0;
-            go_portcullis_tobossrooms = 0;
-            memset(go_roomrunes, 0, sizeof(go_roomrunes));
-            memset(go_emberseerrunes, 0, sizeof(go_emberseerrunes));
         }
 
         void OnCreatureCreate(Creature* creature) override
@@ -504,30 +481,30 @@ public:
 
         protected:
             EventMap Events;
-            uint64 HighlordOmokk;
-            uint64 ShadowHunterVoshgajin;
-            uint64 WarMasterVoone;
-            uint64 MotherSmolderweb;
-            uint64 UrokDoomhowl;
-            uint64 QuartermasterZigris;
-            uint64 GizrultheSlavener;
-            uint64 Halycon;
-            uint64 OverlordWyrmthalak;
-            uint64 PyroguardEmberseer;
-            uint64 WarchiefRendBlackhand;
-            uint64 Gyth;
-            uint64 LordVictorNefarius;
-            uint64 TheBeast;
-            uint64 GeneralDrakkisath;
-            uint64 go_emberseerin;
-            uint64 go_doors;
-            uint64 go_emberseerout;
-            uint64 go_blackrockaltar;
-            uint64 go_roomrunes[7];
-            uint64 go_emberseerrunes[7];
-            uint64 runecreaturelist[7][5];
-            uint64 go_portcullis_active;
-            uint64 go_portcullis_tobossrooms;
+            ObjectGuid HighlordOmokk;
+            ObjectGuid ShadowHunterVoshgajin;
+            ObjectGuid WarMasterVoone;
+            ObjectGuid MotherSmolderweb;
+            ObjectGuid UrokDoomhowl;
+            ObjectGuid QuartermasterZigris;
+            ObjectGuid GizrultheSlavener;
+            ObjectGuid Halycon;
+            ObjectGuid OverlordWyrmthalak;
+            ObjectGuid PyroguardEmberseer;
+            ObjectGuid WarchiefRendBlackhand;
+            ObjectGuid Gyth;
+            ObjectGuid LordVictorNefarius;
+            ObjectGuid TheBeast;
+            ObjectGuid GeneralDrakkisath;
+            ObjectGuid go_emberseerin;
+            ObjectGuid go_doors;
+            ObjectGuid go_emberseerout;
+            ObjectGuid go_blackrockaltar;
+            ObjectGuid go_roomrunes[7];
+            ObjectGuid go_emberseerrunes[7];
+            ObjectGuid runecreaturelist[7][5];
+            ObjectGuid go_portcullis_active;
+            ObjectGuid go_portcullis_tobossrooms;
     };
 
     InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
index 1282cdcd313..6b2d6e1f11a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp
@@ -78,7 +78,7 @@ public:
 
         void Initialize()
         {
-            PlayerGUID = 0;
+            PlayerGUID.Clear();
             HasYelled = false;
         }
 
@@ -231,7 +231,7 @@ public:
         }
 
         private:
-            uint64 PlayerGUID;
+            ObjectGuid PlayerGUID;
             bool HasYelled;
     };
 
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
index ae52e281c9d..696175e91f8 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
@@ -60,25 +60,6 @@ public:
             // Razorgore
             EggCount = 0;
             EggEvent = 0;
-            RazorgoreTheUntamedGUID = 0;
-            RazorgoreDoorGUID = 0;
-            // Vaelastrasz the Corrupt
-            VaelastraszTheCorruptGUID = 0;
-            VaelastraszDoorGUID = 0;
-            // Broodlord Lashlayer
-            BroodlordLashlayerGUID = 0;
-            BroodlordDoorGUID = 0;
-            // 3 Dragons
-            FiremawGUID = 0;
-            EbonrocGUID = 0;
-            FlamegorGUID = 0;
-            ChrommagusDoorGUID = 0;
-            // Chormaggus
-            ChromaggusGUID = 0;
-            NefarianDoorGUID = 0;
-            // Nefarian
-            LordVictorNefariusGUID = 0;
-            NefarianGUID = 0;
             SetBossNumber(EncounterCount);
         }
 
@@ -87,26 +68,6 @@ public:
             // Razorgore
             EggCount = 0;
             EggEvent = 0;
-            RazorgoreTheUntamedGUID = 0;
-            RazorgoreDoorGUID = 0;
-            EggList.clear();
-            // Vaelastrasz the Corrupt
-            VaelastraszTheCorruptGUID = 0;
-            VaelastraszDoorGUID = 0;
-            // Broodlord Lashlayer
-            BroodlordLashlayerGUID = 0;
-            BroodlordDoorGUID = 0;
-            // 3 Dragons
-            FiremawGUID = 0;
-            EbonrocGUID = 0;
-            FlamegorGUID = 0;
-            ChrommagusDoorGUID = 0;
-            // Chormaggus
-            ChromaggusGUID = 0;
-            NefarianDoorGUID = 0;
-            // Nefarian
-            LordVictorNefariusGUID = 0;
-            NefarianGUID = 0;
         }
 
         void OnCreatureCreate(Creature* creature) override
@@ -340,31 +301,31 @@ public:
         // Razorgore
         uint8 EggCount;
         uint32 EggEvent;
-        uint64 RazorgoreTheUntamedGUID;
-        uint64 RazorgoreDoorGUID;
-        std::list<uint64> EggList;
+        ObjectGuid RazorgoreTheUntamedGUID;
+        ObjectGuid RazorgoreDoorGUID;
+        GuidList EggList;
 
         // Vaelastrasz the Corrupt
-        uint64 VaelastraszTheCorruptGUID;
-        uint64 VaelastraszDoorGUID;
+        ObjectGuid VaelastraszTheCorruptGUID;
+        ObjectGuid VaelastraszDoorGUID;
 
         // Broodlord Lashlayer
-        uint64 BroodlordLashlayerGUID;
-        uint64 BroodlordDoorGUID;
+        ObjectGuid BroodlordLashlayerGUID;
+        ObjectGuid BroodlordDoorGUID;
 
         // 3 Dragons
-        uint64 FiremawGUID;
-        uint64 EbonrocGUID;
-        uint64 FlamegorGUID;
-        uint64 ChrommagusDoorGUID;
+        ObjectGuid FiremawGUID;
+        ObjectGuid EbonrocGUID;
+        ObjectGuid FlamegorGUID;
+        ObjectGuid ChrommagusDoorGUID;
 
         // Chormaggus
-        uint64 ChromaggusGUID;
-        uint64 NefarianDoorGUID;
+        ObjectGuid ChromaggusGUID;
+        ObjectGuid NefarianDoorGUID;
 
         // Nefarian
-        uint64 LordVictorNefariusGUID;
-        uint64 NefarianGUID;
+        ObjectGuid LordVictorNefariusGUID;
+        ObjectGuid NefarianGUID;
     };
 
     InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
index 800b6bb0edc..6144bb17fe3 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
@@ -45,9 +45,6 @@ class instance_molten_core : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(MAX_ENCOUNTER);
-                _golemaggTheIncineratorGUID = 0;
-                _majordomoExecutusGUID = 0;
-                _cacheOfTheFirelordGUID = 0;
                 _executusSchedule = false;
                 _ragnarosAddDeaths = 0;
             }
@@ -176,9 +173,9 @@ class instance_molten_core : public InstanceMapScript
             }
 
         private:
-            uint64 _golemaggTheIncineratorGUID;
-            uint64 _majordomoExecutusGUID;
-            uint64 _cacheOfTheFirelordGUID;
+            ObjectGuid _golemaggTheIncineratorGUID;
+            ObjectGuid _majordomoExecutusGUID;
+            ObjectGuid _cacheOfTheFirelordGUID;
             bool  _executusSchedule;
             uint8 _ragnarosAddDeaths;
         };
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
index c5f4f9cdbf9..5de561598f1 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
@@ -59,32 +59,24 @@ class instance_deadmines : public InstanceMapScript
         {
             instance_deadmines_InstanceMapScript(Map* map) : InstanceScript(map) { }
 
-            uint64 FactoryDoorGUID;
-            uint64 IronCladDoorGUID;
-            uint64 DefiasCannonGUID;
-            uint64 DoorLeverGUID;
-            uint64 DefiasPirate1GUID;
-            uint64 DefiasPirate2GUID;
-            uint64 DefiasCompanionGUID;
+            ObjectGuid FactoryDoorGUID;
+            ObjectGuid IronCladDoorGUID;
+            ObjectGuid DefiasCannonGUID;
+            ObjectGuid DoorLeverGUID;
+            ObjectGuid DefiasPirate1GUID;
+            ObjectGuid DefiasPirate2GUID;
+            ObjectGuid DefiasCompanionGUID;
 
             uint32 State;
             uint32 CannonBlast_Timer;
             uint32 PiratesDelay_Timer;
-            uint64 uiSmiteChestGUID;
+            ObjectGuid uiSmiteChestGUID;
 
             void Initialize() override
             {
                 SetHeaders(DataHeader);
-                FactoryDoorGUID = 0;
-                IronCladDoorGUID = 0;
-                DefiasCannonGUID = 0;
-                DoorLeverGUID = 0;
-                DefiasPirate1GUID = 0;
-                DefiasPirate2GUID = 0;
-                DefiasCompanionGUID = 0;
 
                 State = CANNON_NOT_USED;
-                uiSmiteChestGUID = 0;
             }
 
             virtual void Update(uint32 diff) override
diff --git a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
index f8e00fab682..54e1742e132 100644
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
@@ -41,19 +41,14 @@ public:
 
         uint32 m_auiEncounter[MAX_ENCOUNTER];
 
-        uint64 uiCaveInLeftGUID;
-        uint64 uiCaveInRightGUID;
+        ObjectGuid uiCaveInLeftGUID;
+        ObjectGuid uiCaveInRightGUID;
 
-        uint64 uiBastmasterEmiShortfuseGUID;
+        ObjectGuid uiBastmasterEmiShortfuseGUID;
 
         void Initialize() override
         {
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
-
-            uiCaveInLeftGUID                = 0;
-            uiCaveInRightGUID               = 0;
-
-            uiBastmasterEmiShortfuseGUID    = 0;
         }
 
         void Load(const char* in) override
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
index c09b349f143..f2a080d9f9f 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp
@@ -398,7 +398,7 @@ public:
             if (me->HasUnitState(UNIT_STATE_STUNNED))      // While shifting to phase 2 malchezaar stuns himself
                 return;
 
-            if (me->GetVictim() && me->GetUInt64Value(UNIT_FIELD_TARGET) != me->EnsureVictim()->GetGUID())
+            if (me->GetVictim() && me->GetTarget() != me->EnsureVictim()->GetGUID())
                 me->SetTarget(me->EnsureVictim()->GetGUID());
 
             if (phase == 1)
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
index c66f2b335c4..70f3dba6ee9 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_shade_of_aran.cpp
@@ -134,7 +134,7 @@ public:
 
         uint32 FlameWreathTimer;
         uint32 FlameWreathCheckTime;
-        uint64 FlameWreathTarget[3];
+        ObjectGuid FlameWreathTarget[3];
         float FWTargPosX[3];
         float FWTargPosY[3];
 
@@ -393,9 +393,9 @@ public:
                         FlameWreathTimer = 20000;
                         FlameWreathCheckTime = 500;
 
-                        FlameWreathTarget[0] = 0;
-                        FlameWreathTarget[1] = 0;
-                        FlameWreathTarget[2] = 0;
+                        FlameWreathTarget[0].Clear();
+                        FlameWreathTarget[1].Clear();
+                        FlameWreathTarget[2].Clear();
 
                         FlameWreathEffect();
                         break;
@@ -465,7 +465,7 @@ public:
                         {
                             unit->CastSpell(unit, 20476, true, 0, 0, me->GetGUID());
                             unit->CastSpell(unit, 11027, true);
-                            FlameWreathTarget[i] = 0;
+                            FlameWreathTarget[i].Clear();
                         }
                     }
                     FlameWreathCheckTime = 500;
diff --git a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
index 8f6d142e22b..8bc84939573 100644
--- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
@@ -64,21 +64,21 @@ public:
         uint32 m_uiOperaEvent;
         uint32 m_uiOzDeathCount;
 
-        uint64 m_uiCurtainGUID;
-        uint64 m_uiStageDoorLeftGUID;
-        uint64 m_uiStageDoorRightGUID;
-        uint64 m_uiKilrekGUID;
-        uint64 m_uiTerestianGUID;
-        uint64 m_uiMoroesGUID;
-        uint64 m_uiLibraryDoor;                                     // Door at Shade of Aran
-        uint64 m_uiMassiveDoor;                                     // Door at Netherspite
-        uint64 m_uiSideEntranceDoor;                                // Side Entrance
-        uint64 m_uiGamesmansDoor;                                   // Door before Chess
-        uint64 m_uiGamesmansExitDoor;                               // Door after Chess
-        uint64 m_uiNetherspaceDoor;                                // Door at Malchezaar
-        uint64 MastersTerraceDoor[2];
-        uint64 ImageGUID;
-        uint64 DustCoveredChest;
+        ObjectGuid m_uiCurtainGUID;
+        ObjectGuid m_uiStageDoorLeftGUID;
+        ObjectGuid m_uiStageDoorRightGUID;
+        ObjectGuid m_uiKilrekGUID;
+        ObjectGuid m_uiTerestianGUID;
+        ObjectGuid m_uiMoroesGUID;
+        ObjectGuid m_uiLibraryDoor;                                     // Door at Shade of Aran
+        ObjectGuid m_uiMassiveDoor;                                     // Door at Netherspite
+        ObjectGuid m_uiSideEntranceDoor;                                // Side Entrance
+        ObjectGuid m_uiGamesmansDoor;                                   // Door before Chess
+        ObjectGuid m_uiGamesmansExitDoor;                               // Door after Chess
+        ObjectGuid m_uiNetherspaceDoor;                                // Door at Malchezaar
+        ObjectGuid MastersTerraceDoor[2];
+        ObjectGuid ImageGUID;
+        ObjectGuid DustCoveredChest;
 
         void Initialize() override
         {
@@ -88,25 +88,6 @@ public:
             // 1 - OZ, 2 - HOOD, 3 - RAJ, this never gets altered.
             m_uiOperaEvent      = urand(1, 3);
             m_uiOzDeathCount    = 0;
-
-            m_uiCurtainGUID         = 0;
-            m_uiStageDoorLeftGUID   = 0;
-            m_uiStageDoorRightGUID  = 0;
-
-            m_uiKilrekGUID      = 0;
-            m_uiTerestianGUID   = 0;
-            m_uiMoroesGUID      = 0;
-
-            m_uiLibraryDoor         = 0;
-            m_uiMassiveDoor         = 0;
-            m_uiSideEntranceDoor    = 0;
-            m_uiGamesmansDoor       = 0;
-            m_uiGamesmansExitDoor   = 0;
-            m_uiNetherspaceDoor     = 0;
-            MastersTerraceDoor[0]= 0;
-            MastersTerraceDoor[1]= 0;
-            ImageGUID = 0;
-            DustCoveredChest    = 0;
         }
 
         bool IsEncounterInProgress() const override
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
index cc2af3dcea5..e504a9b179b 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_priestess_delrissa.cpp
@@ -119,7 +119,6 @@ public:
         {
             Initialize();
             instance = creature->GetInstanceScript();
-            memset(&m_auiLackeyGUID, 0, sizeof(m_auiLackeyGUID));
             LackeyEntryList.clear();
         }
 
@@ -138,7 +137,7 @@ public:
         InstanceScript* instance;
 
         std::vector<uint32> LackeyEntryList;
-        uint64 m_auiLackeyGUID[MAX_ACTIVE_LACKEY];
+        ObjectGuid m_auiLackeyGUID[MAX_ACTIVE_LACKEY];
 
         uint8 PlayersKilled;
 
@@ -1054,7 +1053,6 @@ public:
         boss_garaxxasAI(Creature* creature) : boss_priestess_lackey_commonAI(creature)
         {
             Initialize();
-            m_uiPetGUID = 0;
         }
 
         void Initialize()
@@ -1067,7 +1065,7 @@ public:
             Freezing_Trap_Timer = 15000;
         }
 
-        uint64 m_uiPetGUID;
+        ObjectGuid m_uiPetGUID;
 
         uint32 Aimed_Shot_Timer;
         uint32 Shoot_Timer;
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
index d34123c58b2..834ae373e71 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_selin_fireheart.cpp
@@ -71,7 +71,6 @@ class boss_selin_fireheart : public CreatureScript
         {
             boss_selin_fireheartAI(Creature* creature) : BossAI(creature, DATA_SELIN)
             {
-                CrystalGUID = 0;
                 _scheduledEvents = false;
             }
 
@@ -89,7 +88,7 @@ class boss_selin_fireheart : public CreatureScript
                 }
 
                 _Reset();
-                CrystalGUID = 0;
+                CrystalGUID.Clear();
                 _scheduledEvents = false;
             }
 
@@ -255,7 +254,7 @@ class boss_selin_fireheart : public CreatureScript
 
         private:
             std::list<Creature*> Crystals;
-            uint64 CrystalGUID;
+            ObjectGuid CrystalGUID;
             bool _scheduledEvents;
         };
 
diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
index 01491c53f72..95ac29e7a9e 100644
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -50,12 +50,6 @@ class instance_magisters_terrace : public InstanceMapScript
                 LoadDoorData(doorData);
 
                 DelrissaDeathCount = 0;
-
-                SelinGUID          = 0;
-                DelrissaGUID       = 0;
-                EscapeOrbGUID      = 0;
-
-                memset(KaelStatue, 0, 2 * sizeof(uint64));
             }
 
             uint32 GetData(uint32 type) const override
@@ -183,10 +177,10 @@ class instance_magisters_terrace : public InstanceMapScript
             }
 
         protected:
-            uint64 SelinGUID;
-            uint64 DelrissaGUID;
-            uint64 KaelStatue[2];
-            uint64 EscapeOrbGUID;
+            ObjectGuid SelinGUID;
+            ObjectGuid DelrissaGUID;
+            ObjectGuid KaelStatue[2];
+            ObjectGuid EscapeOrbGUID;
             uint32 DelrissaDeathCount;
         };
 
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
index ee624c4f6a5..fe433a6692d 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp
@@ -60,12 +60,12 @@ public:
         {
             speechTimer = 0;
             speechCounter = 0;
-            playerGUID = 0;
+            playerGUID.Clear();
         }
 
         uint32 speechTimer;
         uint32 speechCounter;
-        uint64 playerGUID;
+        ObjectGuid playerGUID;
 
         void Reset() override
         {
@@ -223,7 +223,7 @@ public:
         {
             wave = 0;
             waveTimer = 3000;
-            valrothGUID = 0;
+            valrothGUID.Clear();
         }
 
         void Reset() override
@@ -357,7 +357,7 @@ public:
     private:
         uint8 wave;
         uint32 waveTimer;
-        uint64 valrothGUID;
+        ObjectGuid valrothGUID;
 
     };
 
@@ -642,12 +642,12 @@ public:
         {
             ExecuteSpeech_Timer = 0;
             ExecuteSpeech_Counter = 0;
-            PlayerGUID = 0;
+            PlayerGUID.Clear();
         }
 
         uint32 ExecuteSpeech_Timer;
         uint32 ExecuteSpeech_Counter;
-        uint64 PlayerGUID;
+        ObjectGuid PlayerGUID;
 
         void Reset() override
         {
diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
index f6757afd5bc..a042977362f 100644
--- a/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp
@@ -311,25 +311,6 @@ public:
     {
         npc_highlord_darion_mograineAI(Creature* creature) : npc_escortAI(creature)
         {
-            uiTirionGUID = 0;
-            uiAlexandrosGUID = 0;
-            uiDarionGUID = 0;
-            uiKorfaxGUID = 0;
-            uiMaxwellGUID = 0;
-            uiEligorGUID = 0;
-            uiRayneGUID = 0;
-            uiKoltiraGUID = 0;
-            uiOrbazGUID = 0;
-            uiThassarianGUID = 0;
-            uiLichKingGUID = 0;
-
-            memset(uiDefenderGUID, 0, sizeof(uiDefenderGUID));
-            memset(uiEarthshatterGUID, 0, sizeof(uiEarthshatterGUID));
-            memset(uiAbominationGUID, 0, sizeof(uiAbominationGUID));
-            memset(uiBehemothGUID, 0, sizeof(uiBehemothGUID));
-            memset(uiGhoulGUID, 0, sizeof(uiGhoulGUID));
-            memset(uiWarriorGUID, 0, sizeof(uiWarriorGUID));
-
             Reset();
         }
 
@@ -352,25 +333,25 @@ public:
         uint32 uiTargetcheck;
 
         // Dawn
-        uint64 uiTirionGUID;
-        uint64 uiAlexandrosGUID;
-        uint64 uiDarionGUID;
-        uint64 uiKorfaxGUID;
-        uint64 uiMaxwellGUID;
-        uint64 uiEligorGUID;
-        uint64 uiRayneGUID;
-        uint64 uiDefenderGUID[ENCOUNTER_DEFENDER_NUMBER];
-        uint64 uiEarthshatterGUID[ENCOUNTER_EARTHSHATTER_NUMBER];
+        ObjectGuid uiTirionGUID;
+        ObjectGuid uiAlexandrosGUID;
+        ObjectGuid uiDarionGUID;
+        ObjectGuid uiKorfaxGUID;
+        ObjectGuid uiMaxwellGUID;
+        ObjectGuid uiEligorGUID;
+        ObjectGuid uiRayneGUID;
+        ObjectGuid uiDefenderGUID[ENCOUNTER_DEFENDER_NUMBER];
+        ObjectGuid uiEarthshatterGUID[ENCOUNTER_EARTHSHATTER_NUMBER];
 
         // Death
-        uint64 uiKoltiraGUID;
-        uint64 uiOrbazGUID;
-        uint64 uiThassarianGUID;
-        uint64 uiLichKingGUID;
-        uint64 uiAbominationGUID[ENCOUNTER_ABOMINATION_NUMBER];
-        uint64 uiBehemothGUID[ENCOUNTER_BEHEMOTH_NUMBER];
-        uint64 uiGhoulGUID[ENCOUNTER_GHOUL_NUMBER];
-        uint64 uiWarriorGUID[ENCOUNTER_WARRIOR_NUMBER];
+        ObjectGuid uiKoltiraGUID;
+        ObjectGuid uiOrbazGUID;
+        ObjectGuid uiThassarianGUID;
+        ObjectGuid uiLichKingGUID;
+        ObjectGuid uiAbominationGUID[ENCOUNTER_ABOMINATION_NUMBER];
+        ObjectGuid uiBehemothGUID[ENCOUNTER_BEHEMOTH_NUMBER];
+        ObjectGuid uiGhoulGUID[ENCOUNTER_GHOUL_NUMBER];
+        ObjectGuid uiWarriorGUID[ENCOUNTER_WARRIOR_NUMBER];
 
         void Reset() override
         {
@@ -413,23 +394,23 @@ public:
                 if (Creature* temp = ObjectAccessor::GetCreature(*me, uiRayneGUID))
                     temp->setDeathState(JUST_DIED);
 
-                uiTirionGUID = 0;
-                uiKorfaxGUID = 0;
-                uiMaxwellGUID = 0;
-                uiEligorGUID = 0;
-                uiRayneGUID = 0;
+                uiTirionGUID.Clear();
+                uiKorfaxGUID.Clear();
+                uiMaxwellGUID.Clear();
+                uiEligorGUID.Clear();
+                uiRayneGUID.Clear();
 
                 for (uint8 i = 0; i < ENCOUNTER_DEFENDER_NUMBER; ++i)
                 {
                     if (Creature* temp = ObjectAccessor::GetCreature(*me, uiDefenderGUID[i]))
                         temp->setDeathState(JUST_DIED);
-                    uiDefenderGUID[i] = 0;
+                    uiDefenderGUID[i].Clear();
                 }
                 for (uint8 i = 0; i < ENCOUNTER_EARTHSHATTER_NUMBER; ++i)
                 {
                     if (Creature* temp = ObjectAccessor::GetCreature(*me, uiEarthshatterGUID[i]))
                         temp->setDeathState(JUST_DIED);
-                    uiEarthshatterGUID[i] = 0;
+                    uiEarthshatterGUID[i].Clear();
                 }
 
                 if (Creature* temp = ObjectAccessor::GetCreature(*me, uiKoltiraGUID))
@@ -441,33 +422,33 @@ public:
                 if (Creature* temp = ObjectAccessor::GetCreature(*me, uiLichKingGUID))
                     temp->Respawn();
 
-                uiKoltiraGUID = 0;
-                uiOrbazGUID = 0;
-                uiThassarianGUID = 0;
-                uiLichKingGUID = 0;
+                uiKoltiraGUID.Clear();
+                uiOrbazGUID.Clear();
+                uiThassarianGUID.Clear();
+                uiLichKingGUID.Clear();
                 for (uint8 i = 0; i < ENCOUNTER_ABOMINATION_NUMBER; ++i)
                 {
                     if (Creature* temp = ObjectAccessor::GetCreature(*me, uiAbominationGUID[i]))
                         temp->setDeathState(JUST_DIED);
-                    uiAbominationGUID[i] = 0;
+                    uiAbominationGUID[i].Clear();
                 }
                 for (uint8 i = 0; i < ENCOUNTER_BEHEMOTH_NUMBER; ++i)
                 {
                     if (Creature* temp = ObjectAccessor::GetCreature(*me, uiBehemothGUID[i]))
                         temp->setDeathState(JUST_DIED);
-                    uiBehemothGUID[i] = 0;
+                    uiBehemothGUID[i].Clear();
                 }
                 for (uint8 i = 0; i < ENCOUNTER_GHOUL_NUMBER; ++i)
                 {
                     if (Creature* temp = ObjectAccessor::GetCreature(*me, uiGhoulGUID[i]))
                         temp->setDeathState(JUST_DIED);
-                    uiGhoulGUID[i] = 0;
+                    uiGhoulGUID[i].Clear();
                 }
                 for (uint8 i = 0; i < ENCOUNTER_WARRIOR_NUMBER; ++i)
                 {
                     if (Creature* temp = ObjectAccessor::GetCreature(*me, uiWarriorGUID[i]))
                         temp->setDeathState(JUST_DIED);
-                    uiWarriorGUID[i] = 0;
+                    uiWarriorGUID[i].Clear();
                 }
             }
         }
diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
index 3a79dac3a90..a29f8d3374e 100644
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -38,13 +38,6 @@ class instance_scarlet_monastery : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
 
-                PumpkinShrineGUID      = 0;
-                HorsemanGUID           = 0;
-                HeadGUID               = 0;
-                MograineGUID           = 0;
-                WhitemaneGUID          = 0;
-                VorrelGUID             = 0;
-
                 HorsemanAdds.clear();
             }
 
@@ -124,7 +117,7 @@ class instance_scarlet_monastery : public InstanceMapScript
                     case DATA_HORSEMAN_EVENT:
                         if (state == DONE)
                         {
-                            for (uint64 guid : HorsemanAdds)
+                            for (ObjectGuid guid : HorsemanAdds)
                             {
                                 Creature* add = instance->GetCreature(guid);
                                 if (add && add->IsAlive())
@@ -157,14 +150,14 @@ class instance_scarlet_monastery : public InstanceMapScript
             }
 
         protected:
-            uint64 PumpkinShrineGUID;
-            uint64 HorsemanGUID;
-            uint64 HeadGUID;
-            uint64 MograineGUID;
-            uint64 WhitemaneGUID;
-            uint64 VorrelGUID;
-
-            std::set<uint64> HorsemanAdds;
+            ObjectGuid PumpkinShrineGUID;
+            ObjectGuid HorsemanGUID;
+            ObjectGuid HeadGUID;
+            ObjectGuid MograineGUID;
+            ObjectGuid WhitemaneGUID;
+            ObjectGuid VorrelGUID;
+
+            GuidSet HorsemanAdds;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
index f1959b6cf56..f87d3c5d574 100644
--- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
@@ -38,15 +38,6 @@ class instance_scholomance : public InstanceMapScript
             {
                 SetHeaders(DataHeader);
                 SetBossNumber(EncounterCount);
-                GateKirtonosGUID        = 0;
-                GateGandlingGUID        = 0;
-                GateMiliciaGUID         = 0;
-                GateTheolenGUID         = 0;
-                GatePolkeltGUID         = 0;
-                GateRavenianGUID        = 0;
-                GateBarovGUID           = 0;
-                GateIlluciaGUID         = 0;
-                BrazierOfTheHeraldGUID  = 0;
             }
 
             void OnGameObjectCreate(GameObject* go) override
@@ -175,15 +166,15 @@ class instance_scholomance : public InstanceMapScript
             }
 
         protected:
-            uint64 GateKirtonosGUID;
-            uint64 GateGandlingGUID;
-            uint64 GateMiliciaGUID;
-            uint64 GateTheolenGUID;
-            uint64 GatePolkeltGUID;
-            uint64 GateRavenianGUID;
-            uint64 GateBarovGUID;
-            uint64 GateIlluciaGUID;
-            uint64 BrazierOfTheHeraldGUID;
+            ObjectGuid GateKirtonosGUID;
+            ObjectGuid GateGandlingGUID;
+            ObjectGuid GateMiliciaGUID;
+            ObjectGuid GateTheolenGUID;
+            ObjectGuid GatePolkeltGUID;
+            ObjectGuid GateRavenianGUID;
+            ObjectGuid GateBarovGUID;
+            ObjectGuid GateIlluciaGUID;
+            ObjectGuid BrazierOfTheHeraldGUID;
         };
 };
 
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index 10c4aedf103..806f5506760 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -83,13 +83,13 @@ public:
         uint32 m_auiEncounter[MAX_ENCOUNTER];
         std::string str_data;
 
-        uint64 uiAshGUID;
-        uint64 uiAdaGUID;
-        uint64 uiArchmageArugalGUID;
+        ObjectGuid uiAshGUID;
+        ObjectGuid uiAdaGUID;
+        ObjectGuid uiArchmageArugalGUID;
 
-        uint64 DoorCourtyardGUID;
-        uint64 DoorSorcererGUID;
-        uint64 DoorArugalGUID;
+        ObjectGuid DoorCourtyardGUID;
+        ObjectGuid DoorSorcererGUID;
+        ObjectGuid DoorArugalGUID;
 
         uint8 uiPhase;
         uint16 uiTimer;
@@ -99,14 +99,6 @@ public:
             SetHeaders(DataHeader);
             memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
 
-            uiAshGUID = 0;
-            uiAdaGUID = 0;
-            uiArchmageArugalGUID = 0;
-
-            DoorCourtyardGUID = 0;
-            DoorSorcererGUID = 0;
-            DoorArugalGUID = 0;
-
             uiPhase = 0;
             uiTimer = 0;
         }
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
index 43ce4d05297..3509683b852 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -56,21 +56,21 @@ class instance_stratholme : public InstanceMapScript
 
             bool IsSilverHandDead[5];
 
-            uint64 serviceEntranceGUID;
-            uint64 gauntletGate1GUID;
-            uint64 ziggurat1GUID;
-            uint64 ziggurat2GUID;
-            uint64 ziggurat3GUID;
-            uint64 ziggurat4GUID;
-            uint64 ziggurat5GUID;
-            uint64 portGauntletGUID;
-            uint64 portSlaugtherGUID;
-            uint64 portElderGUID;
-
-            uint64 baronGUID;
-            uint64 ysidaTriggerGUID;
-            std::set<uint64> crystalsGUID;
-            std::set<uint64> abomnationGUID;
+            ObjectGuid serviceEntranceGUID;
+            ObjectGuid gauntletGate1GUID;
+            ObjectGuid ziggurat1GUID;
+            ObjectGuid ziggurat2GUID;
+            ObjectGuid ziggurat3GUID;
+            ObjectGuid ziggurat4GUID;
+            ObjectGuid ziggurat5GUID;
+            ObjectGuid portGauntletGUID;
+            ObjectGuid portSlaugtherGUID;
+            ObjectGuid portElderGUID;
+
+            ObjectGuid baronGUID;
+            ObjectGuid ysidaTriggerGUID;
+            GuidSet crystalsGUID;
+            GuidSet abomnationGUID;
             EventMap events;
 
             void Initialize() override
@@ -81,19 +81,6 @@ class instance_stratholme : public InstanceMapScript
                 for (uint8 i = 0; i < 5; ++i)
                     IsSilverHandDead[i] = false;
 
-                serviceEntranceGUID = 0;
-                gauntletGate1GUID = 0;
-                ziggurat1GUID = 0;
-                ziggurat2GUID = 0;
-                ziggurat3GUID = 0;
-                ziggurat4GUID = 0;
-                ziggurat5GUID = 0;
-                portGauntletGUID = 0;
-                portSlaugtherGUID = 0;
-                portElderGUID = 0;
-
-                baronGUID = 0;
-                ysidaTriggerGUID = 0;
                 crystalsGUID.clear();
                 abomnationGUID.clear();
             }
diff --git a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
index 9c733677b42..384be9c90a8 100644
--- a/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/stratholme.cpp
@@ -117,12 +117,12 @@ public:
 
         void Initialize()
         {
-            Tagger = 0;
+            Tagger.Clear();
             Die_Timer = 5000;
             Tagged = false;
         }
 
-        uint64 Tagger;
+        ObjectGuid Tagger;
         uint32 Die_Timer;
         bool Tagged;
 
diff --git a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
index ee16a662711..194f5790f44 100644
--- a/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
+++ b/src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp
@@ -63,13 +63,13 @@ public:
             SetHeaders(DataHeader);
         }
 
-        uint64 GOAtalaiStatue1;
-        uint64 GOAtalaiStatue2;
-        uint64 GOAtalaiStatue3;
-        uint64 GOAtalaiStatue4;
-        uint64 GOAtalaiStatue5;
-        uint64 GOAtalaiStatue6;
-        uint64 GOAtalaiIdol;
+        ObjectGuid GOAtalaiStatue1;
+        ObjectGuid GOAtalaiStatue2;
+        ObjectGuid GOAtalaiStatue3;
+        ObjectGuid GOAtalaiStatue4;
+        ObjectGuid GOAtalaiStatue5;
+        ObjectGuid GOAtalaiStatue6;
+        ObjectGuid GOAtalaiIdol;
 
         uint32 State;
 
@@ -82,13 +82,6 @@ public:
 
         void Initialize() override
         {
-            GOAtalaiStatue1 = 0;
-            GOAtalaiStatue2 = 0;
-            GOAtalaiStatue3 = 0;
-            GOAtalaiStatue4 = 0;
-            GOAtalaiStatue5 = 0;
-            GOAtalaiStatue6 = 0;
-            GOAtalaiIdol = 0;
 
             State = 0;
 
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
index 3284febb9f3..723f407a0d5 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_kalecgos.cpp
@@ -593,8 +593,6 @@ public:
         {
             Initialize();
             instance = creature->GetInstanceScript();
-            KalecGUID = 0;
-            KalecgosGUID = 0;
         }
 
         void Initialize()
@@ -616,8 +614,8 @@ public:
         uint32 CheckTimer;
         uint32 ResetThreat;
 
-        uint64 KalecGUID;
-        uint64 KalecgosGUID;
+        ObjectGuid KalecGUID;
+        ObjectGuid KalecgosGUID;
 
         bool isEnraged;
         bool isBanished;
@@ -632,7 +630,7 @@ public:
             {
                 if (Creature* Kalec = ObjectAccessor::GetCreature(*me, KalecGUID))
                     Kalec->setDeathState(JUST_DIED);
-                KalecGUID = 0;
+                KalecGUID.Clear();
             }
 
             Initialize();
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
index 823423fc3a8..2afe998dbfc 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
@@ -183,7 +183,7 @@ public:
         {
             DarkFiend = false;
             HasEnraged = false;
-            EntropiusGUID = 0;
+            EntropiusGUID.Clear();
         }
 
         void Reset() override
@@ -278,7 +278,7 @@ public:
     private:
         bool DarkFiend;
         bool HasEnraged;
-        uint64 EntropiusGUID;
+        ObjectGuid EntropiusGUID;
     };
 
     CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
index 2066c4309b2..f5e5e59d3ea 100644
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -53,21 +53,7 @@ class instance_sunwell_plateau : public InstanceMapScript
                 SetBossNumber(EncounterCount);
                 LoadDoorData(doorData);
 
-                KalecgosDragonGUID          = 0;
-                KalecgosHumanGUID           = 0;
-                SathrovarrGUID              = 0;
-                BrutallusGUID               = 0;
-                MadrigosaGUID               = 0;
-                FelmystGUID                 = 0;
-                AlythessGUID                = 0;
-                SacrolashGUID               = 0;
-                MuruGUID                    = 0;
-                KilJaedenGUID               = 0;
-                KilJaedenControllerGUID     = 0;
-                AnveenaGUID                 = 0;
-                KalecgosKjGUID              = 0;
                 SpectralPlayers             = 0;
-
                 SpectralRealmTimer          = 5000;
             }
 
@@ -214,23 +200,23 @@ class instance_sunwell_plateau : public InstanceMapScript
             }
 
         protected:
-            uint64 KalecgosDragonGUID;
-            uint64 KalecgosHumanGUID;
-            uint64 SathrovarrGUID;
-            uint64 BrutallusGUID;
-            uint64 MadrigosaGUID;
-            uint64 FelmystGUID;
-            uint64 AlythessGUID;
-            uint64 SacrolashGUID;
-            uint64 MuruGUID;
-            uint64 KilJaedenGUID;
-            uint64 KilJaedenControllerGUID;
-            uint64 AnveenaGUID;
-            uint64 KalecgosKjGUID;
-            uint32 SpectralPlayers;
+            ObjectGuid KalecgosDragonGUID;
+            ObjectGuid KalecgosHumanGUID;
+            ObjectGuid SathrovarrGUID;
+            ObjectGuid BrutallusGUID;
+            ObjectGuid MadrigosaGUID;
+            ObjectGuid FelmystGUID;
+            ObjectGuid AlythessGUID;
+            ObjectGuid SacrolashGUID;
+            ObjectGuid MuruGUID;
+            ObjectGuid KilJaedenGUID;
+            ObjectGuid KilJaedenControllerGUID;
+            ObjectGuid AnveenaGUID;
+            ObjectGuid KalecgosKjGUID;
+            ObjectGuid SpectralPlayers;
 
             uint32 SpectralRealmTimer;
-            std::vector<uint64> SpectralRealmList;
+            GuidVector SpectralRealmList;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
index 17a6440702e..2c47d7532c9 100644
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
@@ -52,18 +52,6 @@ class instance_uldaman : public InstanceMapScript
                 SetHeaders(DataHeader);
                 memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
 
-                archaedasGUID = 0;
-                ironayaGUID = 0;
-                whoWokeuiArchaedasGUID = 0;
-
-                altarOfTheKeeperTempleDoor = 0;
-                archaedasTempleDoor = 0;
-                ancientVaultDoor = 0;
-
-                ironayaSealDoor = 0;
-
-                keystoneGUID = 0;
-
                 ironayaSealDoorTimer = 27000; //animation time
                 keystoneCheck = false;
             }
@@ -77,25 +65,25 @@ class instance_uldaman : public InstanceMapScript
                 return false;
             }
 
-            uint64 archaedasGUID;
-            uint64 ironayaGUID;
-            uint64 whoWokeuiArchaedasGUID;
+            ObjectGuid archaedasGUID;
+            ObjectGuid ironayaGUID;
+            ObjectGuid whoWokeuiArchaedasGUID;
 
-            uint64 altarOfTheKeeperTempleDoor;
-            uint64 archaedasTempleDoor;
-            uint64 ancientVaultDoor;
-            uint64 ironayaSealDoor;
+            ObjectGuid altarOfTheKeeperTempleDoor;
+            ObjectGuid archaedasTempleDoor;
+            ObjectGuid ancientVaultDoor;
+            ObjectGuid ironayaSealDoor;
 
-            uint64 keystoneGUID;
+            ObjectGuid keystoneGUID;
 
             uint32 ironayaSealDoorTimer;
             bool keystoneCheck;
 
-            std::vector<uint64> stoneKeepers;
-            std::vector<uint64> altarOfTheKeeperCounts;
-            std::vector<uint64> vaultWalkers;
-            std::vector<uint64> earthenGuardians;
-            std::vector<uint64> archaedasWallMinions;    // minions lined up around the wall
+            GuidVector stoneKeepers;
+            GuidVector altarOfTheKeeperCounts;
+            GuidVector vaultWalkers;
+            GuidVector earthenGuardians;
+            GuidVector archaedasWallMinions;    // minions lined up around the wall
 
             uint32 m_auiEncounter[MAX_ENCOUNTER];
             std::string str_data;
@@ -177,7 +165,7 @@ class instance_uldaman : public InstanceMapScript
             {
                 if (GetData(DATA_ALTAR_DOORS) != DONE)
                 {
-                    for (std::vector<uint64>::const_iterator i = stoneKeepers.begin(); i != stoneKeepers.end(); ++i)
+                    for (GuidVector::const_iterator i = stoneKeepers.begin(); i != stoneKeepers.end(); ++i)
                     {
                         Creature* target = instance->GetCreature(*i);
                         if (!target || !target->IsAlive())
@@ -199,7 +187,7 @@ class instance_uldaman : public InstanceMapScript
                 if (!archaedas)
                     return;
 
-                for (std::vector<uint64>::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
+                for (GuidVector::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
                 {
                     Creature* target = instance->GetCreature(*i);
                     if (!target || !target->IsAlive() || target->getFaction() == 14)
@@ -217,7 +205,7 @@ class instance_uldaman : public InstanceMapScript
             void DeActivateMinions()
             {
                 // first despawn any aggroed wall minions
-                for (std::vector<uint64>::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
+                for (GuidVector::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
                 {
                     Creature* target = instance->GetCreature(*i);
                     if (!target || target->isDead() || target->getFaction() != 14)
@@ -227,7 +215,7 @@ class instance_uldaman : public InstanceMapScript
                 }
 
                 // Vault Walkers
-                for (std::vector<uint64>::const_iterator i = vaultWalkers.begin(); i != vaultWalkers.end(); ++i)
+                for (GuidVector::const_iterator i = vaultWalkers.begin(); i != vaultWalkers.end(); ++i)
                 {
                     Creature* target = instance->GetCreature(*i);
                     if (!target || target->isDead() || target->getFaction() != 14)
@@ -274,7 +262,7 @@ class instance_uldaman : public InstanceMapScript
             void RespawnMinions()
             {
                 // first respawn any aggroed wall minions
-                for (std::vector<uint64>::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
+                for (GuidVector::const_iterator i = archaedasWallMinions.begin(); i != archaedasWallMinions.end(); ++i)
                 {
                     Creature* target = instance->GetCreature(*i);
                     if (target && target->isDead())
@@ -286,7 +274,7 @@ class instance_uldaman : public InstanceMapScript
                 }
 
                 // Vault Walkers
-                for (std::vector<uint64>::const_iterator i = vaultWalkers.begin(); i != vaultWalkers.end(); ++i)
+                for (GuidVector::const_iterator i = vaultWalkers.begin(); i != vaultWalkers.end(); ++i)
                 {
                     Creature* target = instance->GetCreature(*i);
                     if (target && target->isDead())
@@ -298,7 +286,7 @@ class instance_uldaman : public InstanceMapScript
                 }
 
                 // Earthen Guardians
-                for (std::vector<uint64>::const_iterator i = earthenGuardians.begin(); i != earthenGuardians.end(); ++i)
+                for (GuidVector::const_iterator i = earthenGuardians.begin(); i != earthenGuardians.end(); ++i)
                 {
                     Creature* target = instance->GetCreature(*i);
                     if (target && target->isDead())
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
index b15fdd85a00..8ca14cba856 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
@@ -93,10 +93,12 @@ class boss_akilzon : public CreatureScript
 
             void Initialize()
             {
-                TargetGUID = 0;
-                CloudGUID = 0;
-                CycloneGUID = 0;
-                memset(BirdGUIDs, 0, sizeof(BirdGUIDs));
+                TargetGUID.Clear();
+                CloudGUID.Clear();
+                CycloneGUID.Clear();
+                for (ObjectGuid& guid : BirdGUIDs)
+                    guid.Clear();
+
                 StormCount = 0;
                 isRaining = false;
             }
@@ -364,10 +366,10 @@ class boss_akilzon : public CreatureScript
             }
 
             private:
-                uint64 BirdGUIDs[8];
-                uint64 TargetGUID;
-                uint64 CycloneGUID;
-                uint64 CloudGUID;
+                ObjectGuid BirdGUIDs[8];
+                ObjectGuid TargetGUID;
+                ObjectGuid CycloneGUID;
+                ObjectGuid CloudGUID;
                 uint8  StormCount;
                 bool   isRaining;
         };
@@ -394,12 +396,12 @@ class npc_akilzon_eagle : public CreatureScript
             {
                 EagleSwoop_Timer = urand(5000, 10000);
                 arrived = true;
-                TargetGUID = 0;
+                TargetGUID.Clear();
             }
 
             uint32 EagleSwoop_Timer;
             bool arrived;
-            uint64 TargetGUID;
+            ObjectGuid TargetGUID;
 
             void Reset() override
             {
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
index 0cf1f932f10..6e38ca6a39e 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
@@ -85,7 +85,7 @@ class boss_halazzi : public CreatureScript
 
             void Initialize()
             {
-                LynxGUID = 0;
+                LynxGUID.Clear();
                 TransformCount = 0;
                 BerserkTimer = 600000;
                 CheckTimer = 1000;
@@ -103,7 +103,7 @@ class boss_halazzi : public CreatureScript
             uint32 BerserkTimer;
             uint32 TransformCount;
 
-            uint64 LynxGUID;
+            ObjectGuid LynxGUID;
 
             void Reset() override
             {
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
index 3c9d4397d24..c33ad16f265 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
@@ -258,8 +258,8 @@ class boss_hexlord_malacrass : public CreatureScript
                 instance = creature->GetInstanceScript();
                 SelectAddEntry();
                 for (uint8 i = 0; i < 4; ++i)
-                    AddGUID[i] = 0;
-                PlayerGUID = 0;
+                    AddGUID[i].Clear();
+                PlayerGUID.Clear();
                 PlayerClass = CLASS_NONE;
             }
 
@@ -275,10 +275,10 @@ class boss_hexlord_malacrass : public CreatureScript
 
             InstanceScript* instance;
 
-            uint64 AddGUID[4];
+            ObjectGuid AddGUID[4];
             uint32 AddEntry[4];
 
-            uint64 PlayerGUID;
+            ObjectGuid PlayerGUID;
 
             uint32 SpiritBolts_Timer;
             uint32 DrainPower_Timer;
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
index 2e434ed6ab5..37b8b559895 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
@@ -141,7 +141,7 @@ class boss_janalai : public CreatureScript
                 isFlameBreathing = false;
 
                 for (uint8 i = 0; i < 40; ++i)
-                    FireBombGUIDs[i] = 0;
+                    FireBombGUIDs[i].Clear();
             }
 
             InstanceScript* instance;
@@ -159,7 +159,7 @@ class boss_janalai : public CreatureScript
 
             bool isFlameBreathing;
 
-            uint64 FireBombGUIDs[40];
+            ObjectGuid FireBombGUIDs[40];
 
             void Reset() override
             {
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
index 5b9957cb94d..d15f9582460 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
@@ -138,7 +138,6 @@ class boss_zuljin : public CreatureScript
             {
                 Initialize();
                 instance = creature->GetInstanceScript();
-                memset(SpiritGUID, 0, sizeof(SpiritGUID));
                 health_20 = 0;
             }
 
@@ -164,15 +163,15 @@ class boss_zuljin : public CreatureScript
                 Flame_Breath_Timer = 6000;
                 Pillar_Of_Fire_Timer = 7000;
 
-                ClawTargetGUID = 0;
-                TankGUID = 0;
+                ClawTargetGUID.Clear();
+                TankGUID.Clear();
             }
 
             InstanceScript* instance;
 
-            uint64 SpiritGUID[4];
-            uint64 ClawTargetGUID;
-            uint64 TankGUID;
+            ObjectGuid SpiritGUID[4];
+            ObjectGuid ClawTargetGUID;
+            ObjectGuid TankGUID;
 
             uint32 Phase;
             uint32 health_20;
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
index 6081887e609..33f0ee61eae 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -68,19 +68,19 @@ class instance_zulaman : public InstanceMapScript
         {
             instance_zulaman_InstanceMapScript(Map* map) : InstanceScript(map) { }
 
-            uint64 HarkorsSatchelGUID;
-            uint64 TanzarsTrunkGUID;
-            uint64 AshlisBagGUID;
-            uint64 KrazsPackageGUID;
-            uint64 StrangeGongGUID;
-            uint64 HarrisonJonesGUID;
-
-            uint64 HexLordGateGUID;
-            uint64 ZulJinGateGUID;
-            uint64 MassiveGateGUID;
-            uint64 AkilzonDoorGUID;
-            uint64 ZulJinDoorGUID;
-            uint64 HalazziDoorGUID;
+            ObjectGuid HarkorsSatchelGUID;
+            ObjectGuid TanzarsTrunkGUID;
+            ObjectGuid AshlisBagGUID;
+            ObjectGuid KrazsPackageGUID;
+            ObjectGuid StrangeGongGUID;
+            ObjectGuid HarrisonJonesGUID;
+
+            ObjectGuid HexLordGateGUID;
+            ObjectGuid ZulJinGateGUID;
+            ObjectGuid MassiveGateGUID;
+            ObjectGuid AkilzonDoorGUID;
+            ObjectGuid ZulJinDoorGUID;
+            ObjectGuid HalazziDoorGUID;
 
             uint32 QuestTimer;
             uint16 BossKilled;
@@ -95,20 +95,6 @@ class instance_zulaman : public InstanceMapScript
                 SetHeaders(DataHeader);
                 memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
 
-                HarkorsSatchelGUID = 0;
-                TanzarsTrunkGUID = 0;
-                AshlisBagGUID = 0;
-                KrazsPackageGUID = 0;
-                StrangeGongGUID = 0;
-                HexLordGateGUID = 0;
-                ZulJinGateGUID = 0;
-                MassiveGateGUID = 0;
-                AkilzonDoorGUID = 0;
-                HalazziDoorGUID = 0;
-                ZulJinDoorGUID = 0;
-
-                HarrisonJonesGUID = 0;
-
                 QuestTimer = 0;
                 QuestMinute = 0;
                 BossKilled = 0;
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
index 0d780da6560..257c3476dd3 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
@@ -95,8 +95,6 @@ class boss_arlokk : public CreatureScript
             boss_arlokkAI(Creature* creature) : BossAI(creature, DATA_ARLOKK)
             {
                 Initialize();
-                memset(_triggersSideAGUID, 0, sizeof(_triggersSideAGUID));
-                memset(_triggersSideBGUID, 0, sizeof(_triggersSideBGUID));
             }
 
             void Initialize()
@@ -305,8 +303,8 @@ class boss_arlokk : public CreatureScript
         private:
             uint8 _summonCountA;
             uint8 _summonCountB;
-            uint64 _triggersSideAGUID[5];
-            uint64 _triggersSideBGUID[5];
+            ObjectGuid _triggersSideAGUID[5];
+            ObjectGuid _triggersSideBGUID[5];
         };
 
         CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
index 6244d2b72b1..9286df7e595 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
@@ -115,7 +115,6 @@ class boss_mandokir : public CreatureScript
             boss_mandokirAI(Creature* creature) : BossAI(creature, DATA_MANDOKIR)
             {
                 Initialize();
-                memset(chainedSpirtGUIDs, 0, sizeof(chainedSpirtGUIDs));
             }
 
             void Initialize()
@@ -286,7 +285,7 @@ class boss_mandokir : public CreatureScript
 
         private:
             uint8 killCount;
-            uint64 chainedSpirtGUIDs[CHAINED_SPIRT_COUNT];
+            ObjectGuid chainedSpirtGUIDs[CHAINED_SPIRT_COUNT];
         };
 
         CreatureAI* GetAI(Creature* creature) const override
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
index 5aa37642798..d79ee373b8c 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
@@ -46,17 +46,6 @@ class instance_zulgurub : public InstanceMapScript
                 LoadDoorData(doorData);
             }
 
-            void Initialize() override
-            {
-                _zealotLorkhanGUID = 0;
-                _zealotZathGUID = 0;
-                _highPriestTekalGUID = 0;
-                _jindoTheHexxerGUID = 0;
-                _vilebranchSpeakerGUID = 0;
-                _arlokkGUID = 0;
-                _goGongOfBethekkGUID = 0;
-            }
-
             bool IsEncounterInProgress() const override
             {
                 // not active in Zul'Gurub
@@ -149,13 +138,13 @@ class instance_zulgurub : public InstanceMapScript
             //If all High Priest bosses were killed. Lorkhan, Zath and Ohgan are added too.
             //Storing Lorkhan, Zath and Thekal because we need to cast on them later. Jindo is needed for healfunction too.
 
-            uint64 _zealotLorkhanGUID;
-            uint64 _zealotZathGUID;
-            uint64 _highPriestTekalGUID;
-            uint64 _jindoTheHexxerGUID;
-            uint64 _vilebranchSpeakerGUID;
-            uint64 _arlokkGUID;
-            uint64 _goGongOfBethekkGUID;
+            ObjectGuid _zealotLorkhanGUID;
+            ObjectGuid _zealotZathGUID;
+            ObjectGuid _highPriestTekalGUID;
+            ObjectGuid _jindoTheHexxerGUID;
+            ObjectGuid _vilebranchSpeakerGUID;
+            ObjectGuid _arlokkGUID;
+            ObjectGuid _goGongOfBethekkGUID;
         };
 
         InstanceScript* GetInstanceScript(InstanceMap* map) const override
diff --git a/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
index 20e9f28e0b7..c0717958640 100644
--- a/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
@@ -46,7 +46,7 @@ public:
     {
         npc_galen_goodwardAI(Creature* creature) : npc_escortAI(creature)
         {
-            galensCageGUID = 0;
+            galensCageGUID.Clear();
             Reset();
         }
 
@@ -135,7 +135,7 @@ public:
         }
 
     private:
-        uint64 galensCageGUID;
+        ObjectGuid galensCageGUID;
         uint32 periodicSay;
     };
 
diff --git a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
index f953742b864..70d274b9f2f 100644
--- a/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
@@ -77,12 +77,12 @@ public:
         {
             m_uiPhase = 0;
             m_uiPhaseTimer = 5000;
-            m_uiPlayerGUID = 0;
+            m_uiPlayerGUID.Clear();
         }
 
         uint32 m_uiPhase;
         uint32 m_uiPhaseTimer;
-        uint64 m_uiPlayerGUID;
+        ObjectGuid m_uiPlayerGUID;
 
         void Reset() override
         {
diff --git a/src/server/scripts/EasternKingdoms/zone_undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
index ea997c5563f..48f614a73c0 100644
--- a/src/server/scripts/EasternKingdoms/zone_undercity.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp
@@ -108,7 +108,7 @@ public:
         {
             LamentEventTimer = 5000;
             LamentEvent = false;
-            targetGUID = 0;
+            targetGUID.Clear();
 
             FadeTimer = 30000;
             SummonSkeletonTimer = 20000;
@@ -119,7 +119,7 @@ public:
 
         uint32 LamentEventTimer;
         bool LamentEvent;
-        uint64 targetGUID;
+        ObjectGuid targetGUID;
 
         uint32 FadeTimer;
         uint32 SummonSkeletonTimer;