Core/Scripts: Fixed PCH build

2026-01-15 23:20:36 +01:00 · 2014-09-16 00:44:56 +02:00
parent 5ac62d9ca3
commit 9b316fe689
65 changed files with 548 additions and 1027 deletions
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp
@@ -309,7 +309,7 @@ public:
            case DATA_GO_CHALICE:
                return GoSpectralChaliceGUID;
            }
-            return 0;
+            return ObjectGuid::Empty;
        }

        std::string GetSaveData() override
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp
@@ -359,7 +359,7 @@ public:
                default:
                    break;
            }
-            return 0;
+            return ObjectGuid::Empty;
        }

        void Update(uint32 diff) override
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
@@ -161,7 +161,7 @@ public:
                    HandleGameObject(RazorgoreDoorGUID, state == DONE);
                    if (state == DONE)
                    {
-                        for (std::list<uint64>::const_iterator itr = EggList.begin(); itr != EggList.end(); ++itr)
+                        for (GuidList::const_iterator itr = EggList.begin(); itr != EggList.end(); ++itr)
                            if (GameObject* egg = instance->GetGameObject((*itr)))
                                egg->SetPhaseMask(2, true);
                    }
@@ -215,7 +215,7 @@ public:
                case DATA_NEFARIAN:               return NefarianGUID;
            }

-            return 0;
+            return ObjectGuid::Empty;
        }

        void SetData(uint32 type, uint32 data) override
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp
@@ -114,7 +114,7 @@ class instance_molten_core : public InstanceMapScript
                        return _majordomoExecutusGUID;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            bool SetBossState(uint32 bossId, EncounterState state) override
--- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
@@ -228,7 +228,7 @@ class instance_deadmines : public InstanceMapScript
                        return uiSmiteChestGUID;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            void DoPlaySound(GameObject* unit, uint32 sound)
--- a/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
+++ b/src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp
@@ -128,7 +128,7 @@ public:
                case DATA_NPC_BASTMASTER_EMI_SHORTFUSE: return uiBastmasterEmiShortfuseGUID;
            }

-            return 0;
+            return ObjectGuid::Empty;
        }
    };

--- a/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/instance_karazhan.cpp
@@ -267,7 +267,7 @@ public:
                case DATA_IMAGE_OF_MEDIVH:          return ImageGUID;
            }

-            return 0;
+            return ObjectGuid::Empty;
        }

        void Load(char const* chrIn)
--- a/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
+++ b/src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
@@ -511,7 +511,7 @@ public:
        {
            Initialize();

-            if (instance->GetGuidData(DATA_IMAGE_OF_MEDIVH) == 0)
+            if (instance->GetGuidData(DATA_IMAGE_OF_MEDIVH).IsEmpty())
            {
                instance->SetGuidData(DATA_IMAGE_OF_MEDIVH, me->GetGUID());
                (*me).GetMotionMaster()->MovePoint(1, MedivPos[0], MedivPos[1], MedivPos[2]);
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp
@@ -173,7 +173,7 @@ class instance_magisters_terrace : public InstanceMapScript
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

        protected:
--- a/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
+++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.cpp
@@ -165,7 +165,7 @@ public:
                if (Player* player = i->GetSource())
                {
                    if (spell && spell->Effects[0].MiscValue)
-                        player->KilledMonsterCredit(spell->Effects[0].MiscValue, 0);
+                        player->KilledMonsterCredit(spell->Effects[0].MiscValue);
                }
            }
        }
--- a/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
+++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/instance_scarlet_monastery.cpp
@@ -146,7 +146,7 @@ class instance_scarlet_monastery : public InstanceMapScript
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

        protected:
--- a/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
+++ b/src/server/scripts/EasternKingdoms/Scholomance/instance_scholomance.cpp
@@ -124,7 +124,7 @@ class instance_scholomance : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            bool CheckPreBosses(uint32 bossId) const
--- a/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
+++ b/src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
@@ -100,7 +100,7 @@ class instance_stratholme : public InstanceMapScript
            }

            //if withRestoreTime true, then newState will be ignored and GO should be restored to original state after 10 seconds
-            void UpdateGoState(uint64 goGuid, uint32 newState, bool withRestoreTime)
+            void UpdateGoState(ObjectGuid goGuid, uint32 newState, bool withRestoreTime)
            {
                if (!goGuid)
                    return;
@@ -263,7 +263,7 @@ class instance_stratholme : public InstanceMapScript
                            HandleGameObject(portGauntletGUID, false);

                            uint32 count = abomnationGUID.size();
-                            for (std::set<uint64>::const_iterator i = abomnationGUID.begin(); i != abomnationGUID.end(); ++i)
+                            for (GuidSet::const_iterator i = abomnationGUID.begin(); i != abomnationGUID.end(); ++i)
                            {
                                if (Creature* pAbom = instance->GetCreature(*i))
                                    if (!pAbom->IsAlive())
@@ -414,7 +414,7 @@ class instance_stratholme : public InstanceMapScript
                    case DATA_YSIDA_TRIGGER:
                        return ysidaTriggerGUID;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

            void Update(uint32 diff) override
--- a/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
+++ b/src/server/scripts/EasternKingdoms/SunwellPlateau/instance_sunwell_plateau.cpp
@@ -66,7 +66,7 @@ class instance_sunwell_plateau : public InstanceMapScript
                    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;
                    }
                }
@@ -191,12 +191,12 @@ class instance_sunwell_plateau : public InstanceMapScript
                    case DATA_PLAYER_GUID:
                    {
                        Player const* target = GetPlayerInMap();
-                        return target ? target->GetGUID() : 0;
+                        return target ? target->GetGUID() : ObjectGuid::Empty;
                    }
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

        protected:
@@ -213,7 +213,7 @@ class instance_sunwell_plateau : public InstanceMapScript
            ObjectGuid KilJaedenControllerGUID;
            ObjectGuid AnveenaGUID;
            ObjectGuid KalecgosKjGUID;
-            ObjectGuid SpectralPlayers;
+            uint32 SpectralPlayers;

            uint32 SpectralRealmTimer;
            GuidVector SpectralRealmList;
--- a/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
+++ b/src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp
@@ -143,7 +143,7 @@ class instance_uldaman : public InstanceMapScript
                creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_DISABLE_MOVE);
            }

-            void SetDoor(uint64 guid, bool open)
+            void SetDoor(ObjectGuid guid, bool open)
            {
                GameObject* go = instance->GetGameObject(guid);
                if (!go)
@@ -152,7 +152,7 @@ class instance_uldaman : public InstanceMapScript
                HandleGameObject(guid, open);
            }

-            void BlockGO(uint64 guid)
+            void BlockGO(ObjectGuid guid)
            {
                GameObject* go = instance->GetGameObject(guid);
                if (!go)
@@ -225,7 +225,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() || target->getFaction() != 14)
@@ -235,7 +235,7 @@ class instance_uldaman : public InstanceMapScript
                }
            }

-            void ActivateArchaedas(uint64 target)
+            void ActivateArchaedas(ObjectGuid target)
            {
                Creature* archaedas = instance->GetCreature(archaedasGUID);
                if (!archaedas)
@@ -480,7 +480,7 @@ class instance_uldaman : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            } // end GetGuidData

            void ProcessEvent(WorldObject* /*gameObject*/, uint32 eventId) override
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -347,7 +347,7 @@ class instance_zulaman : public InstanceMapScript
                        return MassiveGateGUID;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

        };
--- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
@@ -131,7 +131,7 @@ class instance_zulgurub : public InstanceMapScript
                        return _goGongOfBethekkGUID;
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

        private:
--- a/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
+++ b/src/server/scripts/Kalimdor/BlackfathomDeeps/instance_blackfathom_deeps.cpp
@@ -66,14 +66,14 @@ public:
    {
        instance_blackfathom_deeps_InstanceMapScript(Map* map) : InstanceScript(map) { }

-        uint64 twilightLordKelrisGUID;
-        uint64 shrine1GUID;
-        uint64 shrine2GUID;
-        uint64 shrine3GUID;
-        uint64 shrine4GUID;
-        uint64 shrineOfGelihastGUID;
-        uint64 altarOfTheDeepsGUID;
-        uint64 mainDoorGUID;
+        ObjectGuid twilightLordKelrisGUID;
+        ObjectGuid shrine1GUID;
+        ObjectGuid shrine2GUID;
+        ObjectGuid shrine3GUID;
+        ObjectGuid shrine4GUID;
+        ObjectGuid shrineOfGelihastGUID;
+        ObjectGuid altarOfTheDeepsGUID;
+        ObjectGuid mainDoorGUID;

        uint8 encounter[MAX_ENCOUNTER];
        uint8 countFires;
@@ -84,14 +84,6 @@ public:
            SetHeaders(DataHeader);
            memset(&encounter, 0, sizeof(encounter));

-            twilightLordKelrisGUID = 0;
-            shrine1GUID = 0;
-            shrine2GUID = 0;
-            shrine3GUID = 0;
-            shrine4GUID = 0;
-            shrineOfGelihastGUID = 0;
-            altarOfTheDeepsGUID = 0;
-            mainDoorGUID = 0;
            countFires = 0;
            deathTimes = 0;
        }
@@ -254,7 +246,7 @@ public:
                    return mainDoorGUID;
            }

-            return 0;
+            return ObjectGuid::Empty;
        }
    };
 };
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -62,18 +62,6 @@ public:
            SetHeaders(DataHeader);
            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));

-            m_uiAncientGemGUID.clear();
-
-            RageWinterchill    = 0;
-            Anetheron          = 0;
-            Kazrogal           = 0;
-            Azgalor            = 0;
-            Archimonde         = 0;
-            JainaProudmoore    = 0;
-            Thrall             = 0;
-            TyrandeWhisperwind = 0;
-            HordeGate          = 0;
-            ElfGate            = 0;
            RaidDamage         = 0;
            Trash              = 0;
            hordeRetreat       = 0;
@@ -144,7 +132,7 @@ public:
                case DATA_TYRANDEWHISPERWIND: return TyrandeWhisperwind;
            }

-            return 0;
+            return ObjectGuid::Empty;
        }

        void SetData(uint32 type, uint32 data) override
@@ -219,7 +207,7 @@ public:
                    {
                        if (!m_uiAncientGemGUID.empty())
                        {
-                            for (std::list<uint64>::const_iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr)
+                            for (GuidList::const_iterator itr = m_uiAncientGemGUID.begin(); itr != m_uiAncientGemGUID.end(); ++itr)
                            {
                                //don't know how long it expected
                                DoRespawnGameObject(*itr, DAY);
@@ -309,17 +297,17 @@ public:
        protected:
            uint32 m_auiEncounter[EncounterCount];
            std::string str_data;
-            std::list<uint64> m_uiAncientGemGUID;
-            uint64 RageWinterchill;
-            uint64 Anetheron;
-            uint64 Kazrogal;
-            uint64 Azgalor;
-            uint64 Archimonde;
-            uint64 JainaProudmoore;
-            uint64 Thrall;
-            uint64 TyrandeWhisperwind;
-            uint64 HordeGate;
-            uint64 ElfGate;
+            GuidList m_uiAncientGemGUID;
+            ObjectGuid RageWinterchill;
+            ObjectGuid Anetheron;
+            ObjectGuid Kazrogal;
+            ObjectGuid Azgalor;
+            ObjectGuid Archimonde;
+            ObjectGuid JainaProudmoore;
+            ObjectGuid Thrall;
+            ObjectGuid TyrandeWhisperwind;
+            ObjectGuid HordeGate;
+            ObjectGuid ElfGate;
            uint32 Trash;
            uint32 hordeRetreat;
            uint32 allianceRetreat;
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
@@ -61,19 +61,6 @@ class instance_culling_of_stratholme : public InstanceMapScript
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);

-                _chromieGUID       = 0;
-                _arthasGUID        = 0;
-                _meathookGUID      = 0;
-                _salrammGUID       = 0;
-                _epochGUID         = 0;
-                _malGanisGUID      = 0;
-                _infiniteGUID      = 0;
-                _shkafGateGUID     = 0;
-                _malGanisGate1GUID = 0;
-                _malGanisGate2GUID = 0;
-                _exitGateGUID      = 0;
-                _malGanisChestGUID = 0;
-                _genericBunnyGUID  = 0;
                _crateCount        = 0;
                _eventTimer        = 0;
            }
@@ -270,7 +257,7 @@ class instance_culling_of_stratholme : public InstanceMapScript
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

            void Update(uint32 diff) override
@@ -330,19 +317,19 @@ class instance_culling_of_stratholme : public InstanceMapScript
            }

        private:
-            uint64 _chromieGUID;
-            uint64 _arthasGUID;
-            uint64 _meathookGUID;
-            uint64 _salrammGUID;
-            uint64 _epochGUID;
-            uint64 _malGanisGUID;
-            uint64 _infiniteGUID;
-            uint64 _shkafGateGUID;
-            uint64 _malGanisGate1GUID;
-            uint64 _malGanisGate2GUID;
-            uint64 _exitGateGUID;
-            uint64 _malGanisChestGUID;
-            uint64 _genericBunnyGUID;
+            ObjectGuid _chromieGUID;
+            ObjectGuid _arthasGUID;
+            ObjectGuid _meathookGUID;
+            ObjectGuid _salrammGUID;
+            ObjectGuid _epochGUID;
+            ObjectGuid _malGanisGUID;
+            ObjectGuid _infiniteGUID;
+            ObjectGuid _shkafGateGUID;
+            ObjectGuid _malGanisGate1GUID;
+            ObjectGuid _malGanisGate2GUID;
+            ObjectGuid _exitGateGUID;
+            ObjectGuid _malGanisChestGUID;
+            ObjectGuid _genericBunnyGUID;

            uint32 _crateCount;
            uint32 _eventTimer;
--- a/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/instance_old_hillsbrad.cpp
@@ -58,9 +58,9 @@ public:
        uint32 mBarrelCount;
        uint32 mThrallEventCount;

-        uint64 ThrallGUID;
-        uint64 TarethaGUID;
-        uint64 EpochGUID;
+        ObjectGuid ThrallGUID;
+        ObjectGuid TarethaGUID;
+        ObjectGuid EpochGUID;

        void Initialize() override
        {
@@ -69,9 +69,6 @@ public:

            mBarrelCount        = 0;
            mThrallEventCount   = 0;
-            ThrallGUID          = 0;
-            TarethaGUID         = 0;
-            EpochGUID        = 0;
        }

        Player* GetPlayerInMap()
@@ -100,7 +97,7 @@ public:
                for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
                {
                    if (Player* player = itr->GetSource())
-                        player->KilledMonsterCredit(LODGE_QUEST_TRIGGER, 0);
+                        player->KilledMonsterCredit(LODGE_QUEST_TRIGGER);
                }
            }
        }
@@ -115,9 +112,9 @@ public:
                case TARETHA_ENTRY:
                    TarethaGUID = creature->GetGUID();
                    break;
-            case EPOCH_ENTRY:
-            EpochGUID = creature->GetGUID();
-            break;
+                case EPOCH_ENTRY:
+                    EpochGUID = creature->GetGUID();
+                    break;
            }
        }

@@ -232,10 +229,10 @@ public:
                    return ThrallGUID;
                case DATA_TARETHA:
                    return TarethaGUID;
-            case DATA_EPOCH:
-            return EpochGUID;
+                case DATA_EPOCH:
+                    return EpochGUID;
            }
-            return 0;
+            return ObjectGuid::Empty;
        }
    };

--- a/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/instance_the_black_morass.cpp
@@ -89,13 +89,12 @@ public:
        uint8  mRiftWaveCount;
        uint8  mRiftWaveId;

-        uint64 _medivhGUID;
+        ObjectGuid _medivhGUID;
        uint8  _currentRiftId;

        void Initialize() override
        {
            SetHeaders(DataHeader);
-            _medivhGUID         = 0;
            Clear();
        }

@@ -258,7 +257,7 @@ public:
            if (data == DATA_MEDIVH)
                return _medivhGUID;

-            return 0;
+            return ObjectGuid::Empty;
        }

        Creature* SummonedPortalBoss(Creature* me)
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -53,7 +53,6 @@ public:
            SetHeaders(DataHeader);
            SetBossNumber(EncounterCount);

-            onyxiaGUID               = 0;
            onyxiaLiftoffTimer       = 0;
            manyWhelpsCounter        = 0;
            eruptTimer               = 0;
@@ -102,7 +101,7 @@ public:
            }
        }

-        void FloorEruption(uint64 floorEruptedGUID)
+        void FloorEruption(ObjectGuid floorEruptedGUID)
        {
            if (GameObject* floorEruption = instance->GetGameObject(floorEruptedGUID))
            {
@@ -121,7 +120,7 @@ public:
                {
                    if (((*itr)->GetGOInfo()->displayId == 4392 || (*itr)->GetGOInfo()->displayId == 4472) && (*itr)->GetGOInfo()->trap.spellId == 17731)
                    {
-                        uint64 nearFloorGUID = (*itr)->GetGUID();
+                        ObjectGuid nearFloorGUID = (*itr)->GetGUID();
                        if (FloorEruptionGUID[1].find(nearFloorGUID) != FloorEruptionGUID[1].end() && (*FloorEruptionGUID[1].find(nearFloorGUID)).second == 0)
                        {
                            (*FloorEruptionGUID[1].find(nearFloorGUID)).second = (*FloorEruptionGUID[1].find(floorEruptedGUID)).second+1;
@@ -193,7 +192,7 @@ public:
                    return onyxiaGUID;
            }

-            return 0;
+            return ObjectGuid::Empty;
        }

        void Update(uint32 diff) override
@@ -212,8 +211,8 @@ public:
            {
                if (eruptTimer <= diff)
                {
-                    uint64 frontGuid = FloorEruptionGUIDQueue.front();
-                    std::map<uint64, uint32>::iterator itr = FloorEruptionGUID[1].find(frontGuid);
+                    ObjectGuid frontGuid = FloorEruptionGUIDQueue.front();
+                    std::map<ObjectGuid, uint32>::iterator itr = FloorEruptionGUID[1].find(frontGuid);
                    if (itr != FloorEruptionGUID[1].end())
                    {
                        uint32 treeHeight = itr->second;
@@ -252,11 +251,9 @@ public:
        }

    protected:
-        std::map<uint64, uint32> FloorEruptionGUID[2];
-        std::queue<uint64> FloorEruptionGUIDQueue;
-        uint64 onyxiaGUID;
-        uint64 triggerGUID;
-        uint64 tankGUID;
+        std::map<ObjectGuid, uint32> FloorEruptionGUID[2];
+        std::queue<ObjectGuid> FloorEruptionGUIDQueue;
+        ObjectGuid onyxiaGUID;
        uint32 onyxiaLiftoffTimer;
        uint32 manyWhelpsCounter;
        uint32 eruptTimer;
--- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
@@ -59,7 +59,6 @@ public:

        void Initialize() override
        {
-            goGongGUID      = 0;
            gongWave        = 0;
            fiendsKilled    = 0;
            reaversKilled   = 0;
@@ -172,7 +171,7 @@ public:
        }

    protected:
-        uint64 goGongGUID;
+        ObjectGuid goGongGUID;
        uint16 gongWave;
        uint8  fiendsKilled;
        uint8  reaversKilled;
--- a/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp
@@ -44,14 +44,13 @@ public:
    {
        instance_razorfen_kraul_InstanceMapScript(Map* map) : InstanceScript(map) { }

-        uint64 DoorWardGUID;
+        ObjectGuid DoorWardGUID;
        int WardKeeperDeath;

        void Initialize() override
        {
            SetHeaders(DataHeader);
            WardKeeperDeath = 0;
-            DoorWardGUID = 0;
        }

        Player* GetPlayerInMap()
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp
@@ -30,14 +30,6 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
            {
                SetHeaders(DataHeader);
                SetBossNumber(NUM_ENCOUNTER);
-
-                _kurinaxxGUID   = 0;
-                _rajaxxGUID     = 0;
-                _moamGUID       = 0;
-                _buruGUID       = 0;
-                _ayamissGUID    = 0;
-                _ossirianGUID   = 0;
-                _paralyzedGUID  = 0;
            }

            void OnCreatureCreate(Creature* creature) override
@@ -99,17 +91,17 @@ class instance_ruins_of_ahnqiraj : public InstanceMapScript
                        return _paralyzedGUID;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

        private:
-            uint64 _kurinaxxGUID;
-            uint64 _rajaxxGUID;
-            uint64 _moamGUID;
-            uint64 _buruGUID;
-            uint64 _ayamissGUID;
-            uint64 _ossirianGUID;
-            uint64 _paralyzedGUID;
+            ObjectGuid _kurinaxxGUID;
+            ObjectGuid _rajaxxGUID;
+            ObjectGuid _moamGUID;
+            ObjectGuid _buruGUID;
+            ObjectGuid _ayamissGUID;
+            ObjectGuid _ossirianGUID;
+            ObjectGuid _paralyzedGUID;
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/server/scripts/Kalimdor/TempleOfAhnQiraj/instance_temple_of_ahnqiraj.cpp
@@ -45,12 +45,12 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript
            bool IsBossDied[3];

            //Storing Skeram, Vem and Kri.
-            uint64 SkeramGUID;
-            uint64 VemGUID;
-            uint64 KriGUID;
-            uint64 VeklorGUID;
-            uint64 VeknilashGUID;
-            uint64 ViscidusGUID;
+            ObjectGuid SkeramGUID;
+            ObjectGuid VemGUID;
+            ObjectGuid KriGUID;
+            ObjectGuid VeklorGUID;
+            ObjectGuid VeknilashGUID;
+            ObjectGuid ViscidusGUID;

            uint32 BugTrioDeathCount;

@@ -63,13 +63,6 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript
                IsBossDied[1] = false;
                IsBossDied[2] = false;

-                SkeramGUID = 0;
-                VemGUID = 0;
-                KriGUID = 0;
-                VeklorGUID = 0;
-                VeknilashGUID = 0;
-                ViscidusGUID = 0;
-
                BugTrioDeathCount = 0;

                CthunPhase = 0;
@@ -151,7 +144,7 @@ class instance_temple_of_ahnqiraj : public InstanceMapScript
                case DATA_VISCIDUS:
                    return ViscidusGUID;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }                                                       // end GetGuidData

            void SetData(uint32 type, uint32 data) override
--- a/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
+++ b/src/server/scripts/Kalimdor/WailingCaverns/instance_wailing_caverns.cpp
@@ -46,7 +46,7 @@ public:
        uint32 m_auiEncounter[MAX_ENCOUNTER];

        bool yelled;
-        uint64 NaralexGUID;
+        ObjectGuid NaralexGUID;

        void Initialize() override
        {
@@ -54,7 +54,6 @@ public:
            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));

            yelled = false;
-            NaralexGUID = 0;
        }

        void OnCreatureCreate(Creature* creature) override
@@ -102,7 +101,7 @@ public:
        ObjectGuid GetGuidData(uint32 data) const override
        {
            if (data == DATA_NARALEX)return NaralexGUID;
-            return 0;
+            return ObjectGuid::Empty;
        }

        std::string GetSaveData() override
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -111,13 +111,13 @@ public:
        instance_zulfarrak_InstanceMapScript(Map* map) : InstanceScript(map) { }

        uint32 GahzRillaEncounter;
-        uint64 ZumrahGUID;
-        uint64 BlyGUID;
-        uint64 WeegliGUID;
-        uint64 OroGUID;
-        uint64 RavenGUID;
-        uint64 MurtaGUID;
-        uint64 EndDoorGUID;
+        ObjectGuid ZumrahGUID;
+        ObjectGuid BlyGUID;
+        ObjectGuid WeegliGUID;
+        ObjectGuid OroGUID;
+        ObjectGuid RavenGUID;
+        ObjectGuid MurtaGUID;
+        ObjectGuid EndDoorGUID;
        uint32 PyramidPhase;
        uint32 major_wave_Timer;
        uint32 minor_wave_Timer;
@@ -127,14 +127,6 @@ public:
        void Initialize() override
        {
            SetHeaders(DataHeader);
-            GahzRillaEncounter = NOT_STARTED;
-            ZumrahGUID = 0;
-            BlyGUID = 0;
-            WeegliGUID = 0;
-            OroGUID = 0;
-            RavenGUID = 0;
-            MurtaGUID = 0;
-            EndDoorGUID = 0;
            PyramidPhase = 0;
            major_wave_Timer = 0;
            minor_wave_Timer = 0;
@@ -217,7 +209,7 @@ public:
                case GO_END_DOOR:
                    return EndDoorGUID;
            }
-            return 0;
+            return ObjectGuid::Empty;
        }

        void SetData(uint32 type, uint32 data) override
@@ -315,7 +307,7 @@ public:
            };
        }

-        std::list<uint64> addsAtBase, movedadds;
+        GuidList addsAtBase, movedadds;

        void MoveNPCIfAlive(uint32 entry, float x, float y, float z, float o)
        {
@@ -346,7 +338,7 @@ public:

        bool IsWaveAllDead()
        {
-            for (std::list<uint64>::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr)
+            for (GuidList::iterator itr = addsAtBase.begin(); itr != addsAtBase.end(); ++itr)
            {
                if (Creature* add = instance->GetCreature((*itr)))
                {
@@ -354,7 +346,7 @@ public:
                        return false;
                }
            }
-            for (std::list<uint64>::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr)
+            for (GuidList::iterator itr = movedadds.begin(); itr != movedadds.end(); ++itr)
            {
                if (Creature* add = instance->GetCreature(((*itr))))
                {
--- a/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/Ahnkahet/instance_ahnkahet.cpp
@@ -39,21 +39,10 @@ class instance_ahnkahet : public InstanceMapScript
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);

-                ElderNadoxGUID              = 0;
-                PrinceTaldaramGUID          = 0;
-                JedogaShadowseekerGUID      = 0;
-                AmanitarGUID                = 0;
-                HeraldVolazjGUID            = 0;
-
-                PrinceTaldaramPlatformGUID  = 0;
-                JedogaSacrifices            = 0;
-                JedogaTarget                = 0;
                SwitchTrigger               = 0;

                SpheresState[0]             = 0;
                SpheresState[1]             = 0;
-
-                InitiandGUIDs.clear();
            }

            void OnCreatureCreate(Creature* creature) override
@@ -142,7 +131,7 @@ class instance_ahnkahet : public InstanceMapScript
                        SwitchTrigger = data;
                        break;
                    case DATA_JEDOGA_RESET_INITIANDS:
-                        for (uint64 guid : InitiandGUIDs)
+                        for (ObjectGuid guid : InitiandGUIDs)
                        {
                            if (Creature* creature = instance->GetCreature(guid))
                            {
@@ -165,7 +154,7 @@ class instance_ahnkahet : public InstanceMapScript
                    case DATA_SPHERE_2:
                        return SpheresState[type - DATA_SPHERE_1];
                    case DATA_ALL_INITIAND_DEAD:
-                        for (uint64 guid : InitiandGUIDs)
+                        for (ObjectGuid guid : InitiandGUIDs)
                        {
                            Creature* cr = instance->GetCreature(guid);
                            if (!cr || cr->IsAlive())
@@ -213,16 +202,16 @@ class instance_ahnkahet : public InstanceMapScript
                        return PrinceTaldaramPlatformGUID;
                    case DATA_ADD_JEDOGA_INITIAND:
                    {
-                        std::vector<uint64> vInitiands;
-                        vInitiands.clear();
-                        for (uint64 guid : InitiandGUIDs)
+                        GuidVector vInitiands;
+                        vInitiands.reserve(InitiandGUIDs.size());
+                        for (ObjectGuid guid : InitiandGUIDs)
                        {
                            Creature* cr = instance->GetCreature(guid);
                            if (cr && cr->IsAlive())
                                vInitiands.push_back(guid);
                        }
                        if (vInitiands.empty())
-                            return 0;
+                            return ObjectGuid::Empty;

                        return Trinity::Containers::SelectRandomContainerElement(vInitiands);
                    }
@@ -233,7 +222,7 @@ class instance_ahnkahet : public InstanceMapScript
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

            bool SetBossState(uint32 type, EncounterState state) override
@@ -246,11 +235,9 @@ class instance_ahnkahet : public InstanceMapScript
                    case DATA_JEDOGA_SHADOWSEEKER:
                        if (state == DONE)
                        {
-                            for (uint64 guid : InitiandGUIDs)
-                            {
+                            for (ObjectGuid guid : InitiandGUIDs)
                                if (Creature* cr = instance->GetCreature(guid))
                                    cr->DespawnOrUnsummon();
-                            }
                        }
                        break;
                    default:
@@ -271,17 +258,17 @@ class instance_ahnkahet : public InstanceMapScript
            }

        protected:
-            uint64 ElderNadoxGUID;
-            uint64 PrinceTaldaramGUID;
-            uint64 JedogaShadowseekerGUID;
-            uint64 AmanitarGUID;
-            uint64 HeraldVolazjGUID;
+            ObjectGuid ElderNadoxGUID;
+            ObjectGuid PrinceTaldaramGUID;
+            ObjectGuid JedogaShadowseekerGUID;
+            ObjectGuid AmanitarGUID;
+            ObjectGuid HeraldVolazjGUID;

-            uint64 PrinceTaldaramPlatformGUID;
-            uint64 JedogaSacrifices;
-            uint64 JedogaTarget;
+            ObjectGuid PrinceTaldaramPlatformGUID;
+            ObjectGuid JedogaSacrifices;
+            ObjectGuid JedogaTarget;

-            std::set<uint64> InitiandGUIDs;
+            GuidSet InitiandGUIDs;

            uint32 SpheresState[2];
            uint8 SwitchTrigger;
--- a/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
+++ b/src/server/scripts/Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp
@@ -40,13 +40,6 @@ class instance_azjol_nerub : public InstanceMapScript
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);
-
-                KrikthirGUID        = 0;
-                HadronoxGUID        = 0;
-                AnubarakGUID        = 0;
-                WatcherGashraGUID   = 0;
-                WatcherSilthikGUID  = 0;
-                WatcherNarjilGUID   = 0;
            }

            void OnCreatureCreate(Creature* creature) override
@@ -126,16 +119,16 @@ class instance_azjol_nerub : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

        protected:
-            uint64 KrikthirGUID;
-            uint64 HadronoxGUID;
-            uint64 AnubarakGUID;
-            uint64 WatcherGashraGUID;
-            uint64 WatcherSilthikGUID;
-            uint64 WatcherNarjilGUID;
+            ObjectGuid KrikthirGUID;
+            ObjectGuid HadronoxGUID;
+            ObjectGuid AnubarakGUID;
+            ObjectGuid WatcherGashraGUID;
+            ObjectGuid WatcherSilthikGUID;
+            ObjectGuid WatcherNarjilGUID;
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/instance_obsidian_sanctum.cpp
@@ -35,10 +35,6 @@ public:
        void Initialize() override
        {
            SetHeaders(DataHeader);
-            sartharionGUID = 0;
-            tenebronGUID   = 0;
-            shadronGUID    = 0;
-            vesperonGUID   = 0;
        }

        void OnCreatureCreate(Creature* creature) override
@@ -96,14 +92,14 @@ public:
                case DATA_VESPERON:
                    return vesperonGUID;
            }
-            return 0;
+            return ObjectGuid::Empty;
        }

    protected:
-        uint64 sartharionGUID;
-        uint64 tenebronGUID;
-        uint64 shadronGUID;
-        uint64 vesperonGUID;
+        ObjectGuid sartharionGUID;
+        ObjectGuid tenebronGUID;
+        ObjectGuid shadronGUID;
+        ObjectGuid vesperonGUID;
    };

    InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
+++ b/src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/instance_ruby_sanctum.cpp
@@ -41,23 +41,7 @@ class instance_ruby_sanctum : public InstanceMapScript
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);
-                BaltharusTheWarbornGUID  = 0;
-                GeneralZarithrianGUID    = 0;
-                SavianaRagefireGUID      = 0;
-                HalionGUID               = 0;
-                TwilightHalionGUID       = 0;
-                OrbCarrierGUID           = 0;
-                OrbRotationFocusGUID     = 0;
-                HalionControllerGUID     = 0;
-                CrystalChannelTargetGUID = 0;
-                XerestraszaGUID          = 0;
                BaltharusSharedHealth    = 0;
-                FlameWallsGUID           = 0;
-                FlameRingGUID            = 0;
-                TwilightFlameRingGUID    = 0;
-
-                memset(ZarithrianSpawnStalkerGUID, 0, 2 * sizeof(uint64));
-                memset(BurningTreeGUID, 0, 4 * sizeof(uint64));
            }

            void OnPlayerEnter(Player* /*player*/)
@@ -224,7 +208,7 @@ class instance_ruby_sanctum : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            bool SetBossState(uint32 type, EncounterState state) override
@@ -305,21 +289,21 @@ class instance_ruby_sanctum : public InstanceMapScript
            }

        protected:
-            uint64 BaltharusTheWarbornGUID;
-            uint64 GeneralZarithrianGUID;
-            uint64 SavianaRagefireGUID;
-            uint64 HalionGUID;
-            uint64 TwilightHalionGUID;
-            uint64 HalionControllerGUID;
-            uint64 OrbCarrierGUID;
-            uint64 OrbRotationFocusGUID;
-            uint64 CrystalChannelTargetGUID;
-            uint64 XerestraszaGUID;
-            uint64 FlameWallsGUID;
-            uint64 ZarithrianSpawnStalkerGUID[2];
-            uint64 BurningTreeGUID[4];
-            uint64 FlameRingGUID;
-            uint64 TwilightFlameRingGUID;
+            ObjectGuid BaltharusTheWarbornGUID;
+            ObjectGuid GeneralZarithrianGUID;
+            ObjectGuid SavianaRagefireGUID;
+            ObjectGuid HalionGUID;
+            ObjectGuid TwilightHalionGUID;
+            ObjectGuid HalionControllerGUID;
+            ObjectGuid OrbCarrierGUID;
+            ObjectGuid OrbRotationFocusGUID;
+            ObjectGuid CrystalChannelTargetGUID;
+            ObjectGuid XerestraszaGUID;
+            ObjectGuid FlameWallsGUID;
+            ObjectGuid ZarithrianSpawnStalkerGUID[2];
+            ObjectGuid BurningTreeGUID[4];
+            ObjectGuid FlameRingGUID;
+            ObjectGuid TwilightFlameRingGUID;

            uint32 BaltharusSharedHealth;
        };
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/instance_trial_of_the_champion.cpp
@@ -49,18 +49,18 @@ public:
        uint16 uiGrandChampionsDeaths;
        uint8 uiArgentSoldierDeaths;

-        uint64 uiAnnouncerGUID;
-        uint64 uiMainGateGUID;
-        uint64 uiGrandChampionVehicle1GUID;
-        uint64 uiGrandChampionVehicle2GUID;
-        uint64 uiGrandChampionVehicle3GUID;
-        uint64 uiGrandChampion1GUID;
-        uint64 uiGrandChampion2GUID;
-        uint64 uiGrandChampion3GUID;
-        uint64 uiChampionLootGUID;
-        uint64 uiArgentChampionGUID;
+        ObjectGuid uiAnnouncerGUID;
+        ObjectGuid uiMainGateGUID;
+        ObjectGuid uiGrandChampionVehicle1GUID;
+        ObjectGuid uiGrandChampionVehicle2GUID;
+        ObjectGuid uiGrandChampionVehicle3GUID;
+        ObjectGuid uiGrandChampion1GUID;
+        ObjectGuid uiGrandChampion2GUID;
+        ObjectGuid uiGrandChampion3GUID;
+        ObjectGuid uiChampionLootGUID;
+        ObjectGuid uiArgentChampionGUID;

-        std::list<uint64> VehicleList;
+        GuidList VehicleList;

        std::string str_data;

@@ -73,21 +73,8 @@ public:
            uiGrandChampionsDeaths = 0;
            uiArgentSoldierDeaths = 0;

-            uiAnnouncerGUID        = 0;
-            uiMainGateGUID         = 0;
-            uiGrandChampionVehicle1GUID   = 0;
-            uiGrandChampionVehicle2GUID   = 0;
-            uiGrandChampionVehicle3GUID   = 0;
-            uiGrandChampion1GUID          = 0;
-            uiGrandChampion2GUID          = 0;
-            uiGrandChampion3GUID          = 0;
-            uiChampionLootGUID            = 0;
-            uiArgentChampionGUID          = 0;
-
            bDone = false;

-            VehicleList.clear();
-
            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
        }

@@ -183,7 +170,7 @@ public:
                    m_auiEncounter[0] = uiData;
                    if (uiData == IN_PROGRESS)
                    {
-                        for (std::list<uint64>::const_iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr)
+                        for (GuidList::const_iterator itr = VehicleList.begin(); itr != VehicleList.end(); ++itr)
                            if (Creature* summon = instance->GetCreature(*itr))
                                summon->RemoveFromWorld();
                    }else if (uiData == DONE)
@@ -264,7 +251,7 @@ public:
                case DATA_GRAND_CHAMPION_3: return uiGrandChampion3GUID;
            }

-            return 0;
+            return ObjectGuid::Empty;
        }

        void SetGuidData(uint32 uiType, ObjectGuid uiData) override
--- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
+++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp
@@ -45,29 +45,6 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                MistressOfPainCount = 0;
                TributeToImmortalityEligible = true;
                NeedSave = false;
-
-                TirionFordringGUID = 0;
-                BarrentGUID = 0;
-                TirionGUID = 0;
-                FizzlebangGUID = 0;
-                GarroshGUID = 0;
-                VarianGUID = 0;
-                GormokGUID = 0;
-                AcidmawGUID = 0;
-                DreadscaleGUID = 0;
-                IcehowlGUID = 0;
-                JaraxxusGUID = 0;
-                ChampionsControllerGUID = 0;
-                DarkbaneGUID = 0;
-                LightbaneGUID = 0;
-                AnubarakGUID = 0;
-
-                TributeChestGUID = 0;
-                MainGateDoorGUID = 0;
-                EastPortcullisGUID = 0;
-                WebDoorGUID = 0;
-                CrusadersCacheGUID = 0;
-                FloorGUID = 0;
            }

            bool IsEncounterInProgress() const override
@@ -104,7 +81,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                }
            }

-            void OpenDoor(uint64 guid)
+            void OpenDoor(ObjectGuid guid)
            {
                if (!guid)
                    return;
@@ -113,7 +90,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                    go->SetGoState(GO_STATE_ACTIVE_ALTERNATIVE);
            }

-            void CloseDoor(uint64 guid)
+            void CloseDoor(ObjectGuid guid)
            {
                if (!guid)
                    return;
@@ -520,7 +497,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            uint32 GetData(uint32 type) const override
@@ -742,29 +719,29 @@ class instance_trial_of_the_crusader : public InstanceMapScript
                bool   NeedSave;
                std::string SaveDataBuffer;

-                uint64 BarrentGUID;
-                uint64 TirionGUID;
-                uint64 TirionFordringGUID;
-                uint64 FizzlebangGUID;
-                uint64 GarroshGUID;
-                uint64 VarianGUID;
+                ObjectGuid BarrentGUID;
+                ObjectGuid TirionGUID;
+                ObjectGuid TirionFordringGUID;
+                ObjectGuid FizzlebangGUID;
+                ObjectGuid GarroshGUID;
+                ObjectGuid VarianGUID;

-                uint64 GormokGUID;
-                uint64 AcidmawGUID;
-                uint64 DreadscaleGUID;
-                uint64 IcehowlGUID;
-                uint64 JaraxxusGUID;
-                uint64 ChampionsControllerGUID;
-                uint64 DarkbaneGUID;
-                uint64 LightbaneGUID;
-                uint64 AnubarakGUID;
+                ObjectGuid GormokGUID;
+                ObjectGuid AcidmawGUID;
+                ObjectGuid DreadscaleGUID;
+                ObjectGuid IcehowlGUID;
+                ObjectGuid JaraxxusGUID;
+                ObjectGuid ChampionsControllerGUID;
+                ObjectGuid DarkbaneGUID;
+                ObjectGuid LightbaneGUID;
+                ObjectGuid AnubarakGUID;

-                uint64 CrusadersCacheGUID;
-                uint64 FloorGUID;
-                uint64 TributeChestGUID;
-                uint64 MainGateDoorGUID;
-                uint64 EastPortcullisGUID;
-                uint64 WebDoorGUID;
+                ObjectGuid CrusadersCacheGUID;
+                ObjectGuid FloorGUID;
+                ObjectGuid TributeChestGUID;
+                ObjectGuid MainGateDoorGUID;
+                ObjectGuid EastPortcullisGUID;
+                ObjectGuid WebDoorGUID;

                // Achievement stuff
                uint32 NotOneButTwoJormungarsTimer;
--- a/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
+++ b/src/server/scripts/Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp
@@ -31,15 +31,6 @@ class instance_drak_tharon_keep : public InstanceMapScript
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
-
-                TrollgoreGUID       = 0;
-                NovosGUID           = 0;
-                KingDredGUID        = 0;
-                TharonJaGUID        = 0;
-
-                memset(TrollgoreInvaderSummonerGuids, 0, 3 * sizeof(uint64));
-                memset(NovosCrystalGUIDs, 0, 4 * sizeof(uint64));
-                memset(NovosSummonerGUIDs, 0, 4 * sizeof(uint64));
            }

            void OnCreatureCreate(Creature* creature) override
@@ -150,7 +141,7 @@ class instance_drak_tharon_keep : public InstanceMapScript
                        return NovosSummonerGUIDs[type - DATA_NOVOS_SUMMONER_1];
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            void OnUnitDeath(Unit* unit) override
@@ -161,14 +152,14 @@ class instance_drak_tharon_keep : public InstanceMapScript
            }

        protected:
-            uint64 TrollgoreGUID;
-            uint64 NovosGUID;
-            uint64 KingDredGUID;
-            uint64 TharonJaGUID;
+            ObjectGuid TrollgoreGUID;
+            ObjectGuid NovosGUID;
+            ObjectGuid KingDredGUID;
+            ObjectGuid TharonJaGUID;

-            uint64 TrollgoreInvaderSummonerGuids[3];
-            uint64 NovosCrystalGUIDs[4];
-            uint64 NovosSummonerGUIDs[4];
+            ObjectGuid TrollgoreInvaderSummonerGuids[3];
+            ObjectGuid NovosCrystalGUIDs[4];
+            ObjectGuid NovosSummonerGUIDs[4];
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/instance_forge_of_souls.cpp
@@ -38,8 +38,6 @@ class instance_forge_of_souls : public InstanceMapScript
            {
                SetHeaders(DataHeader);
                SetBossNumber(MAX_ENCOUNTER);
-                bronjahm = 0;
-                devourerOfSouls = 0;

                teamInInstance = 0;
            }
@@ -108,12 +106,12 @@ class instance_forge_of_souls : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

        private:
-            uint64 bronjahm;
-            uint64 devourerOfSouls;
+            ObjectGuid bronjahm;
+            ObjectGuid devourerOfSouls;

            uint32 teamInInstance;
        };
--- a/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp
@@ -686,7 +686,7 @@ class instance_halls_of_reflection : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            void WriteSaveDataMore(std::ostringstream& data) override
--- a/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
+++ b/src/server/scripts/Northrend/FrozenHalls/PitOfSaron/instance_pit_of_saron.cpp
@@ -44,15 +44,7 @@ class instance_pit_of_saron : public InstanceMapScript
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
                LoadDoorData(Doors);
-                _garfrostGUID = 0;
-                _krickGUID = 0;
-                _ickGUID = 0;
-                _tyrannusGUID = 0;
-                _rimefangGUID = 0;
-                _jainaOrSylvanas1GUID = 0;
-                _jainaOrSylvanas2GUID = 0;
                _teamInInstance = 0;
-                _tyrannusEventGUID = 0;
            }

            void OnPlayerEnter(Player* player) override
@@ -263,19 +255,19 @@ class instance_pit_of_saron : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

        private:
-            uint64 _garfrostGUID;
-            uint64 _krickGUID;
-            uint64 _ickGUID;
-            uint64 _tyrannusGUID;
-            uint64 _rimefangGUID;
+            ObjectGuid _garfrostGUID;
+            ObjectGuid _krickGUID;
+            ObjectGuid _ickGUID;
+            ObjectGuid _tyrannusGUID;
+            ObjectGuid _rimefangGUID;

-            uint64 _tyrannusEventGUID;
-            uint64 _jainaOrSylvanas1GUID;
-            uint64 _jainaOrSylvanas2GUID;
+            ObjectGuid _tyrannusEventGUID;
+            ObjectGuid _jainaOrSylvanas1GUID;
+            ObjectGuid _jainaOrSylvanas2GUID;

            uint32 _teamInInstance;
        };
--- a/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
+++ b/src/server/scripts/Northrend/Gundrak/instance_gundrak.cpp
@@ -56,28 +56,28 @@ public:

        uint32 timer;
        uint32 phase;
-        uint64 toActivate;
+        ObjectGuid toActivate;

-        uint64 sladRanGUID;
-        uint64 moorabiGUID;
-        uint64 drakkariColossusGUID;
-        uint64 galDarahGUID;
-        uint64 eckTheFerociousGUID;
+        ObjectGuid sladRanGUID;
+        ObjectGuid moorabiGUID;
+        ObjectGuid drakkariColossusGUID;
+        ObjectGuid galDarahGUID;
+        ObjectGuid eckTheFerociousGUID;

-        uint64 sladRanAltarGUID;
-        uint64 moorabiAltarGUID;
-        uint64 drakkariColossusAltarGUID;
-        uint64 sladRanStatueGUID;
-        uint64 moorabiStatueGUID;
-        uint64 drakkariColossusStatueGUID;
-        uint64 galDarahStatueGUID;
-        uint64 eckTheFerociousDoorGUID;
-        uint64 eckTheFerociousDoorBehindGUID;
-        uint64 galDarahDoor1GUID;
-        uint64 galDarahDoor2GUID;
-        uint64 galDarahDoor3GUID;
-        uint64 bridgeGUID;
-        uint64 collisionGUID;
+        ObjectGuid sladRanAltarGUID;
+        ObjectGuid moorabiAltarGUID;
+        ObjectGuid drakkariColossusAltarGUID;
+        ObjectGuid sladRanStatueGUID;
+        ObjectGuid moorabiStatueGUID;
+        ObjectGuid drakkariColossusStatueGUID;
+        ObjectGuid galDarahStatueGUID;
+        ObjectGuid eckTheFerociousDoorGUID;
+        ObjectGuid eckTheFerociousDoorBehindGUID;
+        ObjectGuid galDarahDoor1GUID;
+        ObjectGuid galDarahDoor2GUID;
+        ObjectGuid galDarahDoor3GUID;
+        ObjectGuid bridgeGUID;
+        ObjectGuid collisionGUID;

        uint32 m_auiEncounter[MAX_ENCOUNTER];

@@ -88,7 +88,7 @@ public:
        GOState bridgeState;
        GOState collisionState;

-        std::set<uint64> DwellerGUIDs;
+        GuidSet DwellerGUIDs;

        std::string str_data;

@@ -98,31 +98,6 @@ public:

            timer = 0;
            phase = 0;
-            toActivate = 0;
-
-            sladRanGUID = 0;
-            moorabiGUID = 0;
-            drakkariColossusGUID = 0;
-            galDarahGUID = 0;
-            eckTheFerociousGUID = 0;
-
-            sladRanAltarGUID = 0;
-            moorabiAltarGUID = 0;
-            drakkariColossusAltarGUID = 0;
-
-            sladRanStatueGUID = 0;
-            moorabiStatueGUID = 0;
-            drakkariColossusStatueGUID = 0;
-            galDarahStatueGUID = 0;
-
-            eckTheFerociousDoorGUID = 0;
-            eckTheFerociousDoorBehindGUID = 0;
-            galDarahDoor1GUID = 0;
-            galDarahDoor2GUID = 0;
-            galDarahDoor3GUID = 0;
-
-            bridgeGUID = 0;
-            collisionGUID = 0;

            sladRanStatueState = GO_STATE_ACTIVE;
            moorabiStatueState = GO_STATE_ACTIVE;
@@ -131,8 +106,6 @@ public:
            bridgeState = GO_STATE_ACTIVE;
            collisionState = GO_STATE_READY;

-            DwellerGUIDs.clear();
-
            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
        }

@@ -391,7 +364,7 @@ public:
                    return toActivate;
            }

-            return 0;
+            return ObjectGuid::Empty;
        }

        std::string GetSaveData() override
@@ -476,7 +449,7 @@ public:
                     GameObject* drakkariColossusStatue = instance->GetGameObject(drakkariColossusStatueGUID);
                     GameObject* galDarahStatue = instance->GetGameObject(galDarahStatueGUID);

-                     toActivate = 0;
+                     toActivate.Clear();

                     if (bridge && collision && sladRanStatue && moorabiStatue && drakkariColossusStatue && galDarahStatue)
                     {
@@ -525,7 +498,7 @@ public:
                     if (GameObject* statueGO = instance->GetGameObject(toActivate))
                         statueGO->SetGoState(GO_STATE_READY);

-                     toActivate = 0;
+                     toActivate.Clear();

                     if (phase == 3)
                         SetGuidData(DATA_STATUE_ACTIVATE, bridgeGUID);
@@ -537,7 +510,7 @@ public:
                timer -= diff;
        }

-         GOState GetObjState(uint64 guid)
+         GOState GetObjState(ObjectGuid guid)
         {
             if (GameObject* go = instance->GetGameObject(guid))
                 return go->GetGoState();
@@ -555,7 +528,7 @@ public:
    bool OnGossipHello(Player* /*player*/, GameObject* go) override
    {
        InstanceScript* instance = go->GetInstanceScript();
-        uint64 statueGUID = 0;
+        ObjectGuid statueGUID;

        go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_NOT_SELECTABLE);
        go->SetGoState(GO_STATE_ACTIVE);
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -120,52 +120,6 @@ class instance_icecrown_citadel : public InstanceMapScript
                LoadDoorData(doorData);
                TeamInInstance = 0;
                HeroicAttempts = MaxHeroicAttempts;
-                LadyDeathwisperElevatorGUID = 0;
-                GunshipGUID = 0;
-                EnemyGunshipGUID = 0;
-                GunshipArmoryGUID = 0;
-                DeathbringerSaurfangGUID = 0;
-                DeathbringerSaurfangDoorGUID = 0;
-                DeathbringerSaurfangEventGUID = 0;
-                DeathbringersCacheGUID = 0;
-                TeleporterLichKingGUID = 0;
-                TeleporterUpperSpireGUID = 0;
-                TeleporterLightsHammerGUID = 0;
-                TeleporterRampartsGUID = 0;
-                TeleporterDeathBringerGUID = 0;
-                TeleporterOratoryGUID = 0;
-                TeleporterSindragosaGUID = 0;
-                PlagueSigilGUID = 0;
-                BloodwingSigilGUID = 0;
-                FrostwingSigilGUID = 0;
-                memset(PutricidePipeGUIDs, 0, 2 * sizeof(uint64));
-                memset(PutricideGateGUIDs, 0, 2 * sizeof(uint64));
-                PutricideCollisionGUID = 0;
-                FestergutGUID = 0;
-                RotfaceGUID = 0;
-                ProfessorPutricideGUID = 0;
-                PutricideTableGUID = 0;
-                memset(BloodCouncilGUIDs, 0, 3 * sizeof(uint64));
-                BloodCouncilControllerGUID = 0;
-                BloodQueenLanaThelGUID = 0;
-                CrokScourgebaneGUID = 0;
-                memset(CrokCaptainGUIDs, 0, 4 * sizeof(uint64));
-                SisterSvalnaGUID = 0;
-                ValithriaDreamwalkerGUID = 0;
-                ValithriaLichKingGUID = 0;
-                ValithriaTriggerGUID = 0;
-                SindragosaGUID = 0;
-                SpinestalkerGUID = 0;
-                RimefangGUID = 0;
-                TheLichKingTeleportGUID = 0;
-                TheLichKingGUID = 0;
-                HighlordTirionFordringGUID = 0;
-                TerenasMenethilGUID = 0;
-                ArthasPlatformGUID = 0;
-                ArthasPrecipiceGUID = 0;
-                FrozenThroneEdgeGUID = 0;
-                FrozenThroneWindGUID = 0;
-                FrozenThroneWarningGUID = 0;
                IsBonedEligible = true;
                IsOozeDanceEligible = true;
                IsNauseaEligible = true;
@@ -174,9 +128,6 @@ class instance_icecrown_citadel : public InstanceMapScript
                UpperSpireTeleporterActiveState = NOT_STARTED;
                BloodQuickeningState = NOT_STARTED;
                BloodQuickeningMinutes = 0;
-                FrozenBolvarGUID = 0;
-                PillarsChainedGUID = 0;
-                PillarsUnchainedGUID = 0;
            }

            // A function to help reduce the number of lines for teleporter management.
@@ -362,7 +313,7 @@ class instance_icecrown_citadel : public InstanceMapScript
            void OnCreatureRemove(Creature* creature) override
            {
                if (creature->GetEntry() == NPC_SINDRAGOSA)
-                    SindragosaGUID = 0;
+                    SindragosaGUID.Clear();
            }

            // Weekly quest spawn prevention
@@ -725,7 +676,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                        break;
                    case GO_THE_SKYBREAKER_A:
                    case GO_ORGRIMS_HAMMER_H:
-                        GunshipGUID = 0;
+                        GunshipGUID.Clear();
                        break;
                    default:
                        break;
@@ -824,7 +775,7 @@ class instance_icecrown_citadel : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            bool SetBossState(uint32 type, EncounterState state) override
@@ -1476,55 +1427,55 @@ class instance_icecrown_citadel : public InstanceMapScript

        protected:
            EventMap Events;
-            uint64 LadyDeathwisperElevatorGUID;
-            uint64 GunshipGUID;
-            uint64 EnemyGunshipGUID;
-            uint64 GunshipArmoryGUID;
-            uint64 DeathbringerSaurfangGUID;
-            uint64 DeathbringerSaurfangDoorGUID;
-            uint64 DeathbringerSaurfangEventGUID;   // Muradin Bronzebeard or High Overlord Saurfang
-            uint64 DeathbringersCacheGUID;
-            uint64 TeleporterLichKingGUID;
-            uint64 TeleporterUpperSpireGUID;
-            uint64 TeleporterLightsHammerGUID;
-            uint64 TeleporterRampartsGUID;
-            uint64 TeleporterDeathBringerGUID;
-            uint64 TeleporterOratoryGUID;
-            uint64 TeleporterSindragosaGUID;
-            uint64 PlagueSigilGUID;
-            uint64 BloodwingSigilGUID;
-            uint64 FrostwingSigilGUID;
-            uint64 PutricidePipeGUIDs[2];
-            uint64 PutricideGateGUIDs[2];
-            uint64 PutricideCollisionGUID;
-            uint64 FestergutGUID;
-            uint64 RotfaceGUID;
-            uint64 ProfessorPutricideGUID;
-            uint64 PutricideTableGUID;
-            uint64 BloodCouncilGUIDs[3];
-            uint64 BloodCouncilControllerGUID;
-            uint64 BloodQueenLanaThelGUID;
-            uint64 CrokScourgebaneGUID;
-            uint64 CrokCaptainGUIDs[4];
-            uint64 SisterSvalnaGUID;
-            uint64 ValithriaDreamwalkerGUID;
-            uint64 ValithriaLichKingGUID;
-            uint64 ValithriaTriggerGUID;
-            uint64 SindragosaGUID;
-            uint64 SpinestalkerGUID;
-            uint64 RimefangGUID;
-            uint64 TheLichKingTeleportGUID;
-            uint64 TheLichKingGUID;
-            uint64 HighlordTirionFordringGUID;
-            uint64 TerenasMenethilGUID;
-            uint64 ArthasPlatformGUID;
-            uint64 ArthasPrecipiceGUID;
-            uint64 FrozenThroneEdgeGUID;
-            uint64 FrozenThroneWindGUID;
-            uint64 FrozenThroneWarningGUID;
-            uint64 FrozenBolvarGUID;
-            uint64 PillarsChainedGUID;
-            uint64 PillarsUnchainedGUID;
+            ObjectGuid LadyDeathwisperElevatorGUID;
+            ObjectGuid GunshipGUID;
+            ObjectGuid EnemyGunshipGUID;
+            ObjectGuid GunshipArmoryGUID;
+            ObjectGuid DeathbringerSaurfangGUID;
+            ObjectGuid DeathbringerSaurfangDoorGUID;
+            ObjectGuid DeathbringerSaurfangEventGUID;   // Muradin Bronzebeard or High Overlord Saurfang
+            ObjectGuid DeathbringersCacheGUID;
+            ObjectGuid TeleporterLichKingGUID;
+            ObjectGuid TeleporterUpperSpireGUID;
+            ObjectGuid TeleporterLightsHammerGUID;
+            ObjectGuid TeleporterRampartsGUID;
+            ObjectGuid TeleporterDeathBringerGUID;
+            ObjectGuid TeleporterOratoryGUID;
+            ObjectGuid TeleporterSindragosaGUID;
+            ObjectGuid PlagueSigilGUID;
+            ObjectGuid BloodwingSigilGUID;
+            ObjectGuid FrostwingSigilGUID;
+            ObjectGuid PutricidePipeGUIDs[2];
+            ObjectGuid PutricideGateGUIDs[2];
+            ObjectGuid PutricideCollisionGUID;
+            ObjectGuid FestergutGUID;
+            ObjectGuid RotfaceGUID;
+            ObjectGuid ProfessorPutricideGUID;
+            ObjectGuid PutricideTableGUID;
+            ObjectGuid BloodCouncilGUIDs[3];
+            ObjectGuid BloodCouncilControllerGUID;
+            ObjectGuid BloodQueenLanaThelGUID;
+            ObjectGuid CrokScourgebaneGUID;
+            ObjectGuid CrokCaptainGUIDs[4];
+            ObjectGuid SisterSvalnaGUID;
+            ObjectGuid ValithriaDreamwalkerGUID;
+            ObjectGuid ValithriaLichKingGUID;
+            ObjectGuid ValithriaTriggerGUID;
+            ObjectGuid SindragosaGUID;
+            ObjectGuid SpinestalkerGUID;
+            ObjectGuid RimefangGUID;
+            ObjectGuid TheLichKingTeleportGUID;
+            ObjectGuid TheLichKingGUID;
+            ObjectGuid HighlordTirionFordringGUID;
+            ObjectGuid TerenasMenethilGUID;
+            ObjectGuid ArthasPlatformGUID;
+            ObjectGuid ArthasPrecipiceGUID;
+            ObjectGuid FrozenThroneEdgeGUID;
+            ObjectGuid FrozenThroneWindGUID;
+            ObjectGuid FrozenThroneWarningGUID;
+            ObjectGuid FrozenBolvarGUID;
+            ObjectGuid PillarsChainedGUID;
+            ObjectGuid PillarsUnchainedGUID;
            uint32 TeamInInstance;
            uint32 ColdflameJetsState;
            uint32 UpperSpireTeleporterActiveState;
--- a/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
+++ b/src/server/scripts/Northrend/Naxxramas/instance_naxxramas.cpp
@@ -112,24 +112,7 @@ class instance_naxxramas : public InstanceMapScript
                LoadDoorData(doorData);
                LoadMinionData(minionData);

-                GothikGateGUID          = 0;
-                HorsemenChestGUID       = 0;
-                FaerlinaGUID            = 0;
-                ThaneGUID               = 0;
-                LadyGUID                = 0;
-                BaronGUID               = 0;
-                SirGUID                 = 0;
-                ThaddiusGUID            = 0;
-                HeiganGUID              = 0;
-                FeugenGUID              = 0;
-                StalaggGUID             = 0;
-                SapphironGUID           = 0;
-                KelthuzadGUID           = 0;
-                KelthuzadTriggerGUID    = 0;
-
                playerDied              = 0;
-
-                memset(PortalsGUID, 0, sizeof(PortalsGUID));
            }

            void OnCreatureCreate(Creature* creature) override
@@ -342,7 +325,7 @@ class instance_naxxramas : public InstanceMapScript
                        return KelthuzadTriggerGUID;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            bool SetBossState(uint32 id, EncounterState state) override
@@ -369,7 +352,7 @@ class instance_naxxramas : public InstanceMapScript
                    if (i == section)
                        continue;

-                    for (uint64 guid : HeiganEruptionGUID[i])
+                    for (ObjectGuid guid : HeiganEruptionGUID[i])
                    {
                        if (GameObject* heiganEruption = instance->GetGameObject(guid))
                        {
@@ -431,39 +414,39 @@ class instance_naxxramas : public InstanceMapScript
        protected:
            /* The Arachnid Quarter */
            // Grand Widow Faerlina
-            uint64 FaerlinaGUID;
+            ObjectGuid FaerlinaGUID;

            /* The Plague Quarter */
            // Heigan the Unclean
-            std::set<uint64> HeiganEruptionGUID[4];
-            uint64 HeiganGUID;
+            GuidSet HeiganEruptionGUID[4];
+            ObjectGuid HeiganGUID;

            /* The Military Quarter */
            // Gothik the Harvester
-            uint64 GothikGateGUID;
+            ObjectGuid GothikGateGUID;
            // The Four Horsemen
-            uint64 ThaneGUID;
-            uint64 LadyGUID;
-            uint64 BaronGUID;
-            uint64 SirGUID;
-            uint64 HorsemenChestGUID;
-            uint64 HorsemenTeleporterGUID;
+            ObjectGuid ThaneGUID;
+            ObjectGuid LadyGUID;
+            ObjectGuid BaronGUID;
+            ObjectGuid SirGUID;
+            ObjectGuid HorsemenChestGUID;
+            ObjectGuid HorsemenTeleporterGUID;
            time_t minHorsemenDiedTime;
            time_t maxHorsemenDiedTime;

            /* The Construct Quarter */
            // Thaddius
-            uint64 ThaddiusGUID;
-            uint64 FeugenGUID;
-            uint64 StalaggGUID;
+            ObjectGuid ThaddiusGUID;
+            ObjectGuid FeugenGUID;
+            ObjectGuid StalaggGUID;

            /* Frostwyrm Lair */
            // Sapphiron
-            uint64 SapphironGUID;
+            ObjectGuid SapphironGUID;
            // Kel'Thuzad
-            uint64 KelthuzadGUID;
-            uint64 KelthuzadTriggerGUID;
-            uint64 PortalsGUID[4];
+            ObjectGuid KelthuzadGUID;
+            ObjectGuid KelthuzadTriggerGUID;
+            ObjectGuid PortalsGUID[4];
            uint8 AbominationCount;

            /* The Immortal / The Undying */
--- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
+++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/instance_eye_of_eternity.cpp
@@ -37,17 +37,7 @@ public:
        {
            SetHeaders(DataHeader);
            SetBossNumber(MAX_ENCOUNTER);
-
-            vortexTriggers.clear();
-            portalTriggers.clear();
-
-            malygosGUID = 0;
-            irisGUID = 0;
-            lastPortalGUID = 0;
-            platformGUID = 0;
-            exitPortalGUID = 0;
-            alexstraszaBunnyGUID = 0;
-        };
+        }

        bool SetBossState(uint32 type, EncounterState state) override
        {
@@ -58,7 +48,7 @@ public:
            {
                if (state == FAIL)
                {
-                    for (std::list<uint64>::const_iterator itr_trigger = portalTriggers.begin(); itr_trigger != portalTriggers.end(); ++itr_trigger)
+                    for (GuidList::const_iterator itr_trigger = portalTriggers.begin(); itr_trigger != portalTriggers.end(); ++itr_trigger)
                    {
                        if (Creature* trigger = instance->GetCreature(*itr_trigger))
                        {
@@ -189,7 +179,7 @@ public:
            if (Creature* malygos = instance->GetCreature(malygosGUID))
            {
                std::list<HostileReference*> m_threatlist = malygos->getThreatManager().getThreatList();
-                for (std::list<uint64>::const_iterator itr_vortex = vortexTriggers.begin(); itr_vortex != vortexTriggers.end(); ++itr_vortex)
+                for (GuidList::const_iterator itr_vortex = vortexTriggers.begin(); itr_vortex != vortexTriggers.end(); ++itr_vortex)
                {
                    if (m_threatlist.empty())
                        return;
@@ -223,7 +213,7 @@ public:
        {
            bool next = (lastPortalGUID == portalTriggers.back() || !lastPortalGUID ? true : false);

-            for (std::list<uint64>::const_iterator itr_trigger = portalTriggers.begin(); itr_trigger != portalTriggers.end(); ++itr_trigger)
+            for (GuidList::const_iterator itr_trigger = portalTriggers.begin(); itr_trigger != portalTriggers.end(); ++itr_trigger)
            {
                if (next)
                {
@@ -276,20 +266,20 @@ public:
                    return giftBoxBunnyGUID;
            }

-            return 0;
+            return ObjectGuid::Empty;
        }

    private:
-        std::list<uint64> vortexTriggers;
-        std::list<uint64> portalTriggers;
-        uint64 malygosGUID;
-        uint64 irisGUID;
-        uint64 lastPortalGUID;
-        uint64 platformGUID;
-        uint64 exitPortalGUID;
-        uint64 heartOfMagicGUID;
-        uint64 alexstraszaBunnyGUID;
-        uint64 giftBoxBunnyGUID;
+        GuidList vortexTriggers;
+        GuidList portalTriggers;
+        ObjectGuid malygosGUID;
+        ObjectGuid irisGUID;
+        ObjectGuid lastPortalGUID;
+        ObjectGuid platformGUID;
+        ObjectGuid exitPortalGUID;
+        ObjectGuid heartOfMagicGUID;
+        ObjectGuid alexstraszaBunnyGUID;
+        ObjectGuid giftBoxBunnyGUID;
        Position focusingIrisPosition;
        Position exitPortalPosition;
    };
--- a/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Nexus/instance_nexus.cpp
@@ -44,12 +44,12 @@ public:

        uint32 m_auiEncounter[NUMBER_OF_ENCOUNTERS];

-        uint64 Anomalus;
-        uint64 Keristrasza;
+        ObjectGuid Anomalus;
+        ObjectGuid Keristrasza;

-        uint64 AnomalusContainmentSphere;
-        uint64 OrmoroksContainmentSphere;
-        uint64 TelestrasContainmentSphere;
+        ObjectGuid AnomalusContainmentSphere;
+        ObjectGuid OrmoroksContainmentSphere;
+        ObjectGuid TelestrasContainmentSphere;

        std::string strInstData;

@@ -57,12 +57,6 @@ public:
        {
            SetHeaders(DataHeader);
            memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));
-
-            Anomalus = 0;
-            Keristrasza = 0;
-            AnomalusContainmentSphere = 0;
-            OrmoroksContainmentSphere = 0;
-            TelestrasContainmentSphere = 0;
        }

        void OnCreatureCreate(Creature* creature) override
@@ -232,7 +226,7 @@ public:
                case ORMOROKS_CONTAINMET_SPHERE:    return OrmoroksContainmentSphere;
                case TELESTRAS_CONTAINMET_SPHERE:   return TelestrasContainmentSphere;
            }
-            return 0;
+            return ObjectGuid::Empty;
        }

        std::string GetSaveData() override
--- a/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
+++ b/src/server/scripts/Northrend/Nexus/Oculus/instance_oculus.cpp
@@ -44,20 +44,7 @@ class instance_oculus : public InstanceMapScript
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);

-                DrakosGUID          = 0;
-                VarosGUID           = 0;
-                UromGUID            = 0;
-                EregosGUID          = 0;
-
                CentrifugueConstructCounter = 0;
-
-                EregosCacheGUID     = 0;
-
-                GreaterWhelpList.clear();
-
-                BelgaristraszGUID   = 0;
-                EternosGUID         = 0;
-                VerdisaGUID         = 0;
            }

            void OnCreatureCreate(Creature* creature) override
@@ -256,7 +243,7 @@ class instance_oculus : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            void FreeDragons()
@@ -282,26 +269,26 @@ class instance_oculus : public InstanceMapScript

            void GreaterWhelps()
            {
-                for (uint64 guid : GreaterWhelpList)
+                for (ObjectGuid guid : GreaterWhelpList)
                    if (Creature* gwhelp = instance->GetCreature(guid))
                        gwhelp->SetPhaseMask(1, true);
            }

        protected:
-            uint64 DrakosGUID;
-            uint64 VarosGUID;
-            uint64 UromGUID;
-            uint64 EregosGUID;
+            ObjectGuid DrakosGUID;
+            ObjectGuid VarosGUID;
+            ObjectGuid UromGUID;
+            ObjectGuid EregosGUID;

-            uint64 BelgaristraszGUID;
-            uint64 EternosGUID;
-            uint64 VerdisaGUID;
+            ObjectGuid BelgaristraszGUID;
+            ObjectGuid EternosGUID;
+            ObjectGuid VerdisaGUID;

            uint8 CentrifugueConstructCounter;

-            uint64 EregosCacheGUID;
+            ObjectGuid EregosCacheGUID;

-            std::list<uint64> GreaterWhelpList;
+            GuidList GreaterWhelpList;
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp
@@ -39,13 +39,6 @@ class instance_halls_of_lightning : public InstanceMapScript
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);
-
-                GeneralBjarngrimGUID = 0;
-                VolkhanGUID          = 0;
-                IonarGUID            = 0;
-                LokenGUID            = 0;
-
-                LokenGlobeGUID       = 0;
            }

            void OnCreatureCreate(Creature* creature) override
@@ -134,16 +127,16 @@ class instance_halls_of_lightning : public InstanceMapScript
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

        protected:
-            uint64 GeneralBjarngrimGUID;
-            uint64 VolkhanGUID;
-            uint64 IonarGUID;
-            uint64 LokenGUID;
+            ObjectGuid GeneralBjarngrimGUID;
+            ObjectGuid VolkhanGUID;
+            ObjectGuid IonarGUID;
+            ObjectGuid LokenGUID;

-            uint64 LokenGlobeGUID;
+            ObjectGuid LokenGlobeGUID;
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
+++ b/src/server/scripts/Northrend/Ulduar/HallsOfStone/instance_halls_of_stone.cpp
@@ -39,22 +39,6 @@ class instance_halls_of_stone : public InstanceMapScript
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);
-
-                KrystallusGUID          = 0;
-                MaidenOfGriefGUID       = 0;
-                SjonnirGUID             = 0;
-
-                KaddrakGUID             = 0;
-                AbedneumGUID            = 0;
-                MarnakGUID              = 0;
-                BrannGUID               = 0;
-
-                TribunalConsoleGUID     = 0;
-                TribunalChestGUID       = 0;
-                TribunalSkyFloorGUID    = 0;
-                KaddrakGoGUID           = 0;
-                AbedneumGoGUID          = 0;
-                MarnakGoGUID            = 0;
            }

            void OnCreatureCreate(Creature* creature) override
@@ -162,7 +146,7 @@ class instance_halls_of_stone : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            bool SetBossState(uint32 type, EncounterState state) override
@@ -205,21 +189,21 @@ class instance_halls_of_stone : public InstanceMapScript
            }

        protected:
-            uint64 KrystallusGUID;
-            uint64 MaidenOfGriefGUID;
-            uint64 SjonnirGUID;
+            ObjectGuid KrystallusGUID;
+            ObjectGuid MaidenOfGriefGUID;
+            ObjectGuid SjonnirGUID;

-            uint64 KaddrakGUID;
-            uint64 AbedneumGUID;
-            uint64 MarnakGUID;
-            uint64 BrannGUID;
+            ObjectGuid KaddrakGUID;
+            ObjectGuid AbedneumGUID;
+            ObjectGuid MarnakGUID;
+            ObjectGuid BrannGUID;

-            uint64 TribunalConsoleGUID;
-            uint64 TribunalChestGUID;
-            uint64 TribunalSkyFloorGUID;
-            uint64 KaddrakGoGUID;
-            uint64 AbedneumGoGUID;
-            uint64 MarnakGoGUID;
+            ObjectGuid TribunalConsoleGUID;
+            ObjectGuid TribunalChestGUID;
+            ObjectGuid TribunalSkyFloorGUID;
+            ObjectGuid KaddrakGoGUID;
+            ObjectGuid AbedneumGoGUID;
+            ObjectGuid MarnakGoGUID;
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
+++ b/src/server/scripts/Northrend/Ulduar/Ulduar/instance_ulduar.cpp
@@ -63,50 +63,50 @@ class instance_ulduar : public InstanceMapScript
            instance_ulduar_InstanceMapScript(InstanceMap* map) : InstanceScript(map) { }

            // Creatures
-            uint64 LeviathanGUID;
-            uint64 IgnisGUID;
-            uint64 RazorscaleGUID;
-            uint64 RazorscaleController;
-            uint64 ExpeditionCommanderGUID;
-            uint64 XT002GUID;
-            uint64 XTToyPileGUIDs[4];
-            uint64 AssemblyGUIDs[3];
-            uint64 KologarnGUID;
-            uint64 AuriayaGUID;
-            uint64 HodirGUID;
-            uint64 ThorimGUID;
-            uint64 FreyaGUID;
-            uint64 ElderGUIDs[3];
-            uint64 MimironGUID;
-            uint64 MimironVehicleGUIDs[3];
-            uint64 MimironComputerGUID;
-            uint64 MimironWorldTriggerGUID;
-            uint64 VezaxGUID;
-            uint64 YoggSaronGUID;
-            uint64 VoiceOfYoggSaronGUID;
-            uint64 SaraGUID;
-            uint64 BrainOfYoggSaronGUID;
-            uint64 KeeperGUIDs[4];
-            uint64 AlgalonGUID;
-            uint64 BrannBronzebeardAlgGUID;
+            ObjectGuid LeviathanGUID;
+            ObjectGuid IgnisGUID;
+            ObjectGuid RazorscaleGUID;
+            ObjectGuid RazorscaleController;
+            ObjectGuid ExpeditionCommanderGUID;
+            ObjectGuid XT002GUID;
+            ObjectGuid XTToyPileGUIDs[4];
+            ObjectGuid AssemblyGUIDs[3];
+            ObjectGuid KologarnGUID;
+            ObjectGuid AuriayaGUID;
+            ObjectGuid HodirGUID;
+            ObjectGuid ThorimGUID;
+            ObjectGuid FreyaGUID;
+            ObjectGuid ElderGUIDs[3];
+            ObjectGuid MimironGUID;
+            ObjectGuid MimironVehicleGUIDs[3];
+            ObjectGuid MimironComputerGUID;
+            ObjectGuid MimironWorldTriggerGUID;
+            ObjectGuid VezaxGUID;
+            ObjectGuid YoggSaronGUID;
+            ObjectGuid VoiceOfYoggSaronGUID;
+            ObjectGuid SaraGUID;
+            ObjectGuid BrainOfYoggSaronGUID;
+            ObjectGuid KeeperGUIDs[4];
+            ObjectGuid AlgalonGUID;
+            ObjectGuid BrannBronzebeardAlgGUID;

            // GameObjects
-            uint64 LeviathanGateGUID;
-            uint64 RazorHarpoonGUIDs[4];
-            uint64 KologarnChestGUID;
-            uint64 KologarnBridgeGUID;
-            uint64 ThorimChestGUID;
-            uint64 HodirRareCacheGUID;
-            uint64 HodirChestGUID;
-            uint64 MimironTramGUID;
-            uint64 MimironElevatorGUID;
-            uint64 MimironButtonGUID;
-            uint64 BrainRoomDoorGUIDs[3];
-            uint64 AlgalonSigilDoorGUID[3];
-            uint64 AlgalonFloorGUID[2];
-            uint64 AlgalonUniverseGUID;
-            uint64 AlgalonTrapdoorGUID;
-            uint64 GiftOfTheObserverGUID;
+            ObjectGuid LeviathanGateGUID;
+            ObjectGuid RazorHarpoonGUIDs[4];
+            ObjectGuid KologarnChestGUID;
+            ObjectGuid KologarnBridgeGUID;
+            ObjectGuid ThorimChestGUID;
+            ObjectGuid HodirRareCacheGUID;
+            ObjectGuid HodirChestGUID;
+            ObjectGuid MimironTramGUID;
+            ObjectGuid MimironElevatorGUID;
+            ObjectGuid MimironButtonGUID;
+            ObjectGuid BrainRoomDoorGUIDs[3];
+            ObjectGuid AlgalonSigilDoorGUID[3];
+            ObjectGuid AlgalonFloorGUID[2];
+            ObjectGuid AlgalonUniverseGUID;
+            ObjectGuid AlgalonTrapdoorGUID;
+            ObjectGuid GiftOfTheObserverGUID;

            // Miscellaneous
            uint32 TeamInInstance;
@@ -119,47 +119,12 @@ class instance_ulduar : public InstanceMapScript
            bool Unbroken;
            bool IsDriveMeCrazyEligible;

-            std::set<uint64> mRubbleSpawns;
-
            void Initialize() override
            {
                SetHeaders(DataHeader);
                SetBossNumber(MAX_ENCOUNTER);
                LoadDoorData(doorData);
                LoadMinionData(minionData);
-                LeviathanGUID                    = 0;
-                IgnisGUID                        = 0;
-                RazorscaleGUID                   = 0;
-                RazorscaleController             = 0;
-                ExpeditionCommanderGUID          = 0;
-                XT002GUID                        = 0;
-                KologarnGUID                     = 0;
-                AuriayaGUID                      = 0;
-                MimironGUID                      = 0;
-                MimironComputerGUID              = 0;
-                MimironWorldTriggerGUID          = 0;
-                HodirGUID                        = 0;
-                ThorimGUID                       = 0;
-                FreyaGUID                        = 0;
-                VezaxGUID                        = 0;
-                YoggSaronGUID                    = 0;
-                VoiceOfYoggSaronGUID             = 0;
-                SaraGUID                         = 0;
-                BrainOfYoggSaronGUID             = 0;
-                AlgalonGUID                      = 0;
-                KologarnChestGUID                = 0;
-                KologarnBridgeGUID               = 0;
-                ThorimChestGUID                  = 0;
-                HodirRareCacheGUID               = 0;
-                HodirChestGUID                   = 0;
-                MimironTramGUID                  = 0;
-                MimironElevatorGUID              = 0;
-                MimironButtonGUID                = 0;
-                LeviathanGateGUID                = 0;
-                AlgalonUniverseGUID              = 0;
-                AlgalonTrapdoorGUID              = 0;
-                BrannBronzebeardAlgGUID          = 0;
-                GiftOfTheObserverGUID            = 0;
                _algalonTimer                    = 61;
                _maxArmorItemLevel               = 0;
                _maxWeaponItemLevel              = 0;
@@ -175,15 +140,6 @@ class instance_ulduar : public InstanceMapScript
                _algalonSummoned                 = false;
                _summonAlgalon                   = false;

-                memset(AlgalonSigilDoorGUID, 0, sizeof(AlgalonSigilDoorGUID));
-                memset(AlgalonFloorGUID, 0, sizeof(AlgalonFloorGUID));
-                memset(XTToyPileGUIDs, 0, sizeof(XTToyPileGUIDs));
-                memset(AssemblyGUIDs, 0, sizeof(AssemblyGUIDs));
-                memset(RazorHarpoonGUIDs, 0, sizeof(RazorHarpoonGUIDs));
-                memset(ElderGUIDs, 0, sizeof(ElderGUIDs));
-                memset(MimironVehicleGUIDs, 0, sizeof(MimironVehicleGUIDs));
-                memset(BrainRoomDoorGUIDs, 0, sizeof(BrainRoomDoorGUIDs));
-                memset(KeeperGUIDs, 0, sizeof(KeeperGUIDs));
                memset(_summonObservationRingKeeper, false, sizeof(_summonObservationRingKeeper));
                memset(_summonYSKeeper, false, sizeof(_summonYSKeeper));
            }
@@ -460,7 +416,7 @@ class instance_ulduar : public InstanceMapScript
                        for (uint8 i = 0; i < 4; ++i)
                            if (XTToyPileGUIDs[i] == creature->GetGUID())
                            {
-                                XTToyPileGUIDs[i] = 0;
+                                XTToyPileGUIDs[i].Clear();
                                break;
                            }
                        break;
@@ -471,7 +427,7 @@ class instance_ulduar : public InstanceMapScript
                        break;
                    case NPC_BRANN_BRONZBEARD_ALG:
                        if (BrannBronzebeardAlgGUID == creature->GetGUID())
-                            BrannBronzebeardAlgGUID = 0;
+                            BrannBronzebeardAlgGUID.Clear();
                        break;
                    default:
                        break;
@@ -975,7 +931,7 @@ class instance_ulduar : public InstanceMapScript
                        return BrannBronzebeardAlgGUID;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            uint32 GetData(uint32 type) const override
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp
@@ -45,11 +45,6 @@ class instance_utgarde_keep : public InstanceMapScript
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);
                LoadMinionData(minionData);
-
-                PrinceKelesethGUID  = 0;
-                SkarvaldGUID        = 0;
-                DalronnGUID         = 0;
-                IngvarGUID          = 0;
            }

            void OnCreatureCreate(Creature* creature) override
@@ -166,7 +161,7 @@ class instance_utgarde_keep : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            void SetData(uint32 type, uint32 data) override
@@ -207,10 +202,10 @@ class instance_utgarde_keep : public InstanceMapScript
        protected:
            ForgeInfo Forges[3];

-            uint64 PrinceKelesethGUID;
-            uint64 SkarvaldGUID;
-            uint64 DalronnGUID;
-            uint64 IngvarGUID;
+            ObjectGuid PrinceKelesethGUID;
+            ObjectGuid SkarvaldGUID;
+            ObjectGuid DalronnGUID;
+            ObjectGuid IngvarGUID;
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h
@@ -76,11 +76,11 @@ enum GameObjectIds

 struct ForgeInfo
 {
-    ForgeInfo() : AnvilGUID(0), BellowGUID(0), FireGUID(0), Event(NOT_STARTED) { };
+    ForgeInfo() : Event(NOT_STARTED) { };

-    uint64 AnvilGUID;
-    uint64 BellowGUID;
-    uint64 FireGUID;
+    ObjectGuid AnvilGUID;
+    ObjectGuid BellowGUID;
+    ObjectGuid FireGUID;

    uint32 Event;
 };
--- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
+++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/instance_utgarde_pinnacle.cpp
@@ -38,23 +38,6 @@ class instance_utgarde_pinnacle : public InstanceMapScript
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);
-
-                SvalaSorrowgraveGUID        = 0;
-                GortokPalehoofGUID          = 0;
-                SkadiTheRuthlessGUID        = 0;
-                KingYmironGUID              = 0;
-
-                UtgardeMirrorGUID           = 0;
-                GortokPalehoofSphereGUID    = 0;
-
-                FrenziedWorgenGUID          = 0;
-                RavenousFurbolgGUID         = 0;
-                FerociousRhinoGUID          = 0;
-                MassiveJormungarGUID        = 0;
-                PalehoofOrbGUID             = 0;
-
-                SvalaGUID                   = 0;
-                SacrificedPlayerGUID        = 0;
            }

            void OnCreatureCreate(Creature* creature) override
@@ -179,27 +162,27 @@ class instance_utgarde_pinnacle : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

        protected:
-            uint64 SvalaSorrowgraveGUID;
-            uint64 GortokPalehoofGUID;
-            uint64 SkadiTheRuthlessGUID;
-            uint64 KingYmironGUID;
+            ObjectGuid SvalaSorrowgraveGUID;
+            ObjectGuid GortokPalehoofGUID;
+            ObjectGuid SkadiTheRuthlessGUID;
+            ObjectGuid KingYmironGUID;

-            uint64 UtgardeMirrorGUID;
-            uint64 GortokPalehoofSphereGUID;
+            ObjectGuid UtgardeMirrorGUID;
+            ObjectGuid GortokPalehoofSphereGUID;

-            uint64 FrenziedWorgenGUID;
-            uint64 RavenousFurbolgGUID;
-            uint64 FerociousRhinoGUID;
-            uint64 MassiveJormungarGUID;
+            ObjectGuid FrenziedWorgenGUID;
+            ObjectGuid RavenousFurbolgGUID;
+            ObjectGuid FerociousRhinoGUID;
+            ObjectGuid MassiveJormungarGUID;

-            uint64 PalehoofOrbGUID;
+            ObjectGuid PalehoofOrbGUID;

-            uint64 SvalaGUID;
-            uint64 SacrificedPlayerGUID;
+            ObjectGuid SvalaGUID;
+            ObjectGuid SacrificedPlayerGUID;
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
+++ b/src/server/scripts/Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp
@@ -38,8 +38,6 @@ class instance_vault_of_archavon : public InstanceMapScript
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);

-                EmalonGUID      = 0;
-                ToravonGUID     = 0;
                ArchavonDeath   = 0;
                EmalonDeath     = 0;
                KoralonDeath    = 0;
@@ -72,7 +70,7 @@ class instance_vault_of_archavon : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            bool SetBossState(uint32 type, EncounterState state) override
@@ -127,8 +125,8 @@ class instance_vault_of_archavon : public InstanceMapScript
            }

        private:
-            uint64 EmalonGUID;
-            uint64 ToravonGUID;
+            ObjectGuid EmalonGUID;
+            ObjectGuid ToravonGUID;
            time_t ArchavonDeath;
            time_t EmalonDeath;
            time_t KoralonDeath;
--- a/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
+++ b/src/server/scripts/Northrend/VioletHold/instance_violet_hold.cpp
@@ -114,35 +114,35 @@ public:
    {
        instance_violet_hold_InstanceMapScript(Map* map) : InstanceScript(map) { }

-        uint64 uiMoragg;
-        uint64 uiErekem;
-        uint64 uiErekemGuard[2];
-        uint64 uiIchoron;
-        uint64 uiLavanthor;
-        uint64 uiXevozz;
-        uint64 uiZuramat;
-        uint64 uiCyanigosa;
-        uint64 uiSinclari;
+        ObjectGuid uiMoragg;
+        ObjectGuid uiErekem;
+        ObjectGuid uiErekemGuard[2];
+        ObjectGuid uiIchoron;
+        ObjectGuid uiLavanthor;
+        ObjectGuid uiXevozz;
+        ObjectGuid uiZuramat;
+        ObjectGuid uiCyanigosa;
+        ObjectGuid uiSinclari;

-        uint64 uiMoraggCell;
-        uint64 uiErekemCell;
-        uint64 uiErekemLeftGuardCell;
-        uint64 uiErekemRightGuardCell;
-        uint64 uiIchoronCell;
-        uint64 uiLavanthorCell;
-        uint64 uiXevozzCell;
-        uint64 uiZuramatCell;
-        uint64 uiMainDoor;
-        uint64 uiTeleportationPortal;
-        uint64 uiSaboteurPortal;
+        ObjectGuid uiMoraggCell;
+        ObjectGuid uiErekemCell;
+        ObjectGuid uiErekemLeftGuardCell;
+        ObjectGuid uiErekemRightGuardCell;
+        ObjectGuid uiIchoronCell;
+        ObjectGuid uiLavanthorCell;
+        ObjectGuid uiXevozzCell;
+        ObjectGuid uiZuramatCell;
+        ObjectGuid uiMainDoor;
+        ObjectGuid uiTeleportationPortal;
+        ObjectGuid uiSaboteurPortal;

-        uint64 uiActivationCrystal[4];
+        ObjectGuid uiActivationCrystal[4];

        uint32 uiActivationTimer;
        uint32 uiCyanigosaEventTimer;
        uint32 uiDoorSpellTimer;

-        std::set<uint64> trashMobs; // to kill with crystal
+        GuidSet trashMobs; // to kill with crystal

        uint8 uiWaveCount;
        uint8 uiLocation;
@@ -171,28 +171,6 @@ public:
        void Initialize() override
        {
            SetHeaders(DataHeader);
-            uiMoragg = 0;
-            uiErekem = 0;
-            uiIchoron = 0;
-            uiLavanthor = 0;
-            uiXevozz = 0;
-            uiZuramat = 0;
-            uiCyanigosa = 0;
-            uiSinclari = 0;
-
-            uiMoraggCell = 0;
-            uiErekemCell = 0;
-            uiErekemGuard[0] = 0;
-            uiErekemGuard[1] = 0;
-            uiIchoronCell = 0;
-            uiLavanthorCell = 0;
-            uiXevozzCell = 0;
-            uiZuramatCell = 0;
-            uiMainDoor = 0;
-            uiTeleportationPortal = 0;
-            uiSaboteurPortal = 0;
-
-            trashMobs.clear();

            uiRemoveNpc = 0;

@@ -471,7 +449,7 @@ public:
                case DATA_SABOTEUR_PORTAL:          return uiSaboteurPortal;
            }

-            return 0;
+            return ObjectGuid::Empty;
        }

        void SpawnPortal()
@@ -817,7 +795,7 @@ public:
            trigger->CastSpell(trigger, spellInfoLightning, true, 0, 0, trigger->GetGUID());

            // Kill all mobs registered with SetGuidData(ADD_TRASH_MOB)
-            for (std::set<uint64>::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)
+            for (GuidSet::const_iterator itr = trashMobs.begin(); itr != trashMobs.end(); ++itr)
            {
                Creature* creature = instance->GetCreature(*itr);
                if (creature && creature->IsAlive())
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -40,8 +40,6 @@ class instance_shadow_labyrinth : public InstanceMapScript
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);

-                AmbassadorHellmawGUID = 0;
-                GrandmasterVorpilGUID = 0;
                FelOverseerCount      = 0;
            }

@@ -132,12 +130,12 @@ class instance_shadow_labyrinth : public InstanceMapScript
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

        protected:
-            uint64 AmbassadorHellmawGUID;
-            uint64 GrandmasterVorpilGUID;
+            ObjectGuid AmbassadorHellmawGUID;
+            ObjectGuid GrandmasterVorpilGUID;
            uint32 FelOverseerCount;
        };

--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -47,23 +47,6 @@ class instance_black_temple : public InstanceMapScript
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);
-
-                NajentusGUID                = 0;
-                SupremusGUID                = 0;
-                ShadeOfAkamaGUID            = 0;
-                AkamaShadeGUID              = 0;
-                AkamaGUID                   = 0;
-                GathiosTheShattererGUID     = 0;
-                HighNethermancerZerevorGUID = 0;
-                LadyMalandeGUID             = 0;
-                VerasDarkshadowGUID         = 0;
-                IllidariCouncilGUID         = 0;
-                BloodElfCouncilVoiceGUID    = 0;
-                IllidanStormrageGUID        = 0;
-
-                IllidanGateGUID             = 0;
-
-                memset(IllidanDoorGUIDs, 0, 2 * sizeof(uint64));
            }

            void OnCreatureCreate(Creature* creature) override
@@ -200,28 +183,28 @@ class instance_black_temple : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

        protected:
-            uint64 NajentusGUID;
-            uint64 SupremusGUID;
-            uint64 ShadeOfAkamaGUID;
-            uint64 AkamaShadeGUID;
-            uint64 AkamaGUID;
+            ObjectGuid NajentusGUID;
+            ObjectGuid SupremusGUID;
+            ObjectGuid ShadeOfAkamaGUID;
+            ObjectGuid AkamaShadeGUID;
+            ObjectGuid AkamaGUID;

-            uint64 GathiosTheShattererGUID;
-            uint64 HighNethermancerZerevorGUID;
-            uint64 LadyMalandeGUID;
-            uint64 VerasDarkshadowGUID;
+            ObjectGuid GathiosTheShattererGUID;
+            ObjectGuid HighNethermancerZerevorGUID;
+            ObjectGuid LadyMalandeGUID;
+            ObjectGuid VerasDarkshadowGUID;

-            uint64 IllidariCouncilGUID;
-            uint64 BloodElfCouncilVoiceGUID;
+            ObjectGuid IllidariCouncilGUID;
+            ObjectGuid BloodElfCouncilVoiceGUID;

-            uint64 IllidanStormrageGUID;
+            ObjectGuid IllidanStormrageGUID;

-            uint64 IllidanGateGUID;
-            uint64 IllidanDoorGUIDs[2];
+            ObjectGuid IllidanGateGUID;
+            ObjectGuid IllidanDoorGUIDs[2];
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -94,20 +94,6 @@ class instance_serpent_shrine : public InstanceMapScript
            {
                memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));

-                LurkerBelow = 0;
-                Sharkkis = 0;
-                Tidalvess = 0;
-                Caribdis = 0;
-                LadyVashj = 0;
-                Karathress = 0;
-                KarathressEvent_Starter = 0;
-                LeotherasTheBlind = 0;
-                LeotherasEventStarter = 0;
-
-                ControlConsole = 0;
-                BridgePart[0] = 0;
-                BridgePart[1] = 0;
-                BridgePart[2] = 0;
                StrangePool = 0;
                Water = WATERSTATE_FRENZY;

@@ -280,7 +266,7 @@ class instance_serpent_shrine : public InstanceMapScript
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

            void SetData(uint32 type, uint32 data) override
@@ -297,7 +283,6 @@ class instance_serpent_shrine : public InstanceMapScript
                            HandleGameObject(BridgePart[0], true);
                            HandleGameObject(BridgePart[0], true);
                        }
-                        ControlConsole = data;
                        break;
                    case DATA_TRASH:
                        if (data == 1 && TrashCount < MIN_KILLS)
@@ -424,18 +409,18 @@ class instance_serpent_shrine : public InstanceMapScript
            }

        private:
-            uint64 LurkerBelow;
-            uint64 Sharkkis;
-            uint64 Tidalvess;
-            uint64 Caribdis;
-            uint64 LadyVashj;
-            uint64 Karathress;
-            uint64 KarathressEvent_Starter;
-            uint64 LeotherasTheBlind;
-            uint64 LeotherasEventStarter;
+            ObjectGuid LurkerBelow;
+            ObjectGuid Sharkkis;
+            ObjectGuid Tidalvess;
+            ObjectGuid Caribdis;
+            ObjectGuid LadyVashj;
+            ObjectGuid Karathress;
+            ObjectGuid KarathressEvent_Starter;
+            ObjectGuid LeotherasTheBlind;
+            ObjectGuid LeotherasEventStarter;

-            uint64 ControlConsole;
-            uint64 BridgePart[3];
+            ObjectGuid ControlConsole;
+            ObjectGuid BridgePart[3];
            uint32 StrangePool;
            uint32 FishingTimer;
            uint32 WaterCheckTimer;
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/instance_steam_vault.cpp
@@ -58,11 +58,6 @@ class instance_steam_vault : public InstanceMapScript
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);

-                ThespiaGUID          = 0;
-                MekgineerGUID        = 0;
-                KalithreshGUID       = 0;
-
-                MainChambersDoorGUID = 0;
                DistillerState       = 0;
            }

@@ -109,7 +104,7 @@ class instance_steam_vault : public InstanceMapScript
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

            void SetData(uint32 type, uint32 data) override
@@ -158,11 +153,11 @@ class instance_steam_vault : public InstanceMapScript
            }

        protected:
-            uint64 ThespiaGUID;
-            uint64 MekgineerGUID;
-            uint64 KalithreshGUID;
+            ObjectGuid ThespiaGUID;
+            ObjectGuid MekgineerGUID;
+            ObjectGuid KalithreshGUID;

-            uint64 MainChambersDoorGUID;
+            ObjectGuid MainChambersDoorGUID;
            uint8 DistillerState;
        };

--- a/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
+++ b/src/server/scripts/Outland/GruulsLair/instance_gruuls_lair.cpp
@@ -48,8 +48,6 @@ class instance_gruuls_lair : public InstanceMapScript
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);
                LoadMinionData(minionData);
-
-                MaulgarGUID = 0;
            }

            void OnCreatureCreate(Creature* creature) override
@@ -121,11 +119,11 @@ class instance_gruuls_lair : public InstanceMapScript
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

        protected:
-            uint64 MaulgarGUID;
+            ObjectGuid MaulgarGUID;
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override
--- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
@@ -44,20 +44,6 @@ class instance_blood_furnace : public InstanceMapScript
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);

-                TheMakerGUID            = 0;
-                BroggokGUID             = 0;
-                KelidanTheBreakerGUID   = 0;
-
-                BroggokLeverGUID        = 0;
-                PrisonDoor4GUID         = 0;
-
-                memset(PrisonCellGUIDs, 0, 8 * sizeof(uint64));
-
-                PrisonersCell5.clear();
-                PrisonersCell6.clear();
-                PrisonersCell7.clear();
-                PrisonersCell8.clear();
-
                PrisonerCounter5        = 0;
                PrisonerCounter6        = 0;
                PrisonerCounter7        = 0;
@@ -168,7 +154,7 @@ class instance_blood_furnace : public InstanceMapScript
                        return BroggokLeverGUID;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            bool SetBossState(uint32 type, EncounterState state) override
@@ -219,9 +205,9 @@ class instance_blood_furnace : public InstanceMapScript
                HandleGameObject(PrisonCellGUIDs[DATA_PRISON_CELL8 - DATA_PRISON_CELL1], false);
            }

-            void ResetPrisoners(const std::set<uint64>& prisoners)
+            void ResetPrisoners(GuidSet const& prisoners)
            {
-                for (std::set<uint64>::const_iterator i = prisoners.begin(); i != prisoners.end(); ++i)
+                for (GuidSet::const_iterator i = prisoners.begin(); i != prisoners.end(); ++i)
                    if (Creature* prisoner = instance->GetCreature(*i))
                        ResetPrisoner(prisoner);
            }
@@ -273,7 +259,7 @@ class instance_blood_furnace : public InstanceMapScript
                ResetPrisoner(creature);
            }

-            void PrisonerDied(uint64 guid)
+            void PrisonerDied(ObjectGuid guid)
            {
                if (PrisonersCell5.find(guid) != PrisonersCell5.end() && --PrisonerCounter5 <= 0)
                    ActivateCell(DATA_PRISON_CELL6);
@@ -313,9 +299,9 @@ class instance_blood_furnace : public InstanceMapScript
                }
            }

-            void ActivatePrisoners(std::set<uint64> const& prisoners)
+            void ActivatePrisoners(GuidSet const& prisoners)
            {
-                for (std::set<uint64>::const_iterator i = prisoners.begin(); i != prisoners.end(); ++i)
+                for (GuidSet::const_iterator i = prisoners.begin(); i != prisoners.end(); ++i)
                    if (Creature* prisoner = instance->GetCreature(*i))
                    {
                        prisoner->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE);
@@ -324,19 +310,19 @@ class instance_blood_furnace : public InstanceMapScript
            }

        protected:
-            uint64 TheMakerGUID;
-            uint64 BroggokGUID;
-            uint64 KelidanTheBreakerGUID;
+            ObjectGuid TheMakerGUID;
+            ObjectGuid BroggokGUID;
+            ObjectGuid KelidanTheBreakerGUID;

-            uint64 BroggokLeverGUID;
-            uint64 PrisonDoor4GUID;
+            ObjectGuid BroggokLeverGUID;
+            ObjectGuid PrisonDoor4GUID;

-            uint64 PrisonCellGUIDs[8];
+            ObjectGuid PrisonCellGUIDs[8];

-            std::set<uint64>PrisonersCell5;
-            std::set<uint64>PrisonersCell6;
-            std::set<uint64>PrisonersCell7;
-            std::set<uint64>PrisonersCell8;
+            GuidSet PrisonersCell5;
+            GuidSet PrisonersCell6;
+            GuidSet PrisonersCell7;
+            GuidSet PrisonersCell8;

            uint8 PrisonerCounter5;
            uint8 PrisonerCounter6;
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/instance_hellfire_ramparts.cpp
@@ -40,7 +40,6 @@ class instance_ramparts : public InstanceMapScript
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
-                felIronChestGUID = 0;
            }

            void OnGameObjectCreate(GameObject* go) override
@@ -74,7 +73,7 @@ class instance_ramparts : public InstanceMapScript
            }

        protected:
-            uint64 felIronChestGUID;
+            ObjectGuid felIronChestGUID;
            bool spawned;
        };

--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp
@@ -58,10 +58,10 @@ class instance_magtheridons_lair : public InstanceMapScript

            uint32 m_auiEncounter[MAX_ENCOUNTER];

-            uint64 MagtheridonGUID;
-            std::set<uint64> ChannelerGUID;
-            uint64 DoorGUID;
-            std::set<uint64> ColumnGUID;
+            ObjectGuid MagtheridonGUID;
+            GuidSet ChannelerGUID;
+            ObjectGuid DoorGUID;
+            GuidSet ColumnGUID;

            uint32 CageTimer;
            uint32 RespawnTimer;
@@ -71,11 +71,6 @@ class instance_magtheridons_lair : public InstanceMapScript
                SetHeaders(DataHeader);
                memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));

-                MagtheridonGUID = 0;
-                ChannelerGUID.clear();
-                DoorGUID = 0;
-                ColumnGUID.clear();
-
                CageTimer = 0;
                RespawnTimer = 0;
            }
@@ -131,7 +126,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                case DATA_MAGTHERIDON:
                    return MagtheridonGUID;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

            void SetData(uint32 type, uint32 data) override
@@ -152,7 +147,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                        if (m_auiEncounter[1] != NOT_STARTED)
                        {
                            m_auiEncounter[1] = NOT_STARTED;
-                            for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                            for (GuidSet::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                            {
                                if (Creature* Channeler = instance->GetCreature(*i))
                                {
@@ -171,7 +166,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                        {
                            m_auiEncounter[1] = IN_PROGRESS;
                            // Let all five channelers aggro.
-                            for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                            for (GuidSet::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                            {
                                Creature* Channeler = instance->GetCreature(*i);
                                if (Channeler && Channeler->IsAlive())
@@ -188,7 +183,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                        }
                        break;
                    case DONE: // Add buff and check if all channelers are dead.
-                        for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                        for (GuidSet::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                        {
                            Creature* Channeler = instance->GetCreature(*i);
                            if (Channeler && Channeler->IsAlive())
@@ -204,7 +199,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                    break;
                case DATA_COLLAPSE:
                    // true - collapse / false - reset
-                    for (std::set<uint64>::const_iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i)
+                    for (GuidSet::const_iterator i = ColumnGUID.begin(); i != ColumnGUID.end(); ++i)
                        DoUseDoorOrButton(*i);
                    break;
                default:
@@ -239,7 +234,7 @@ class instance_magtheridons_lair : public InstanceMapScript
                {
                    if (RespawnTimer <= diff)
                    {
-                        for (std::set<uint64>::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
+                        for (GuidSet::const_iterator i = ChannelerGUID.begin(); i != ChannelerGUID.end(); ++i)
                        {
                            if (Creature* Channeler = instance->GetCreature(*i))
                            {
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/instance_shattered_halls.cpp
@@ -45,9 +45,6 @@ class instance_shattered_halls : public InstanceMapScript
            {
                SetHeaders(DataHeader);
                SetBossNumber(EncounterCount);
-                nethekurseGUID      = 0;
-                nethekurseDoor1GUID = 0;
-                nethekurseDoor2GUID = 0;
            }

            void OnGameObjectCreate(GameObject* go) override
@@ -112,13 +109,13 @@ class instance_shattered_halls : public InstanceMapScript
                        return nethekurseDoor2GUID;
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

        protected:
-            uint64 nethekurseGUID;
-            uint64 nethekurseDoor1GUID;
-            uint64 nethekurseDoor2GUID;
+            ObjectGuid nethekurseGUID;
+            ObjectGuid nethekurseDoor1GUID;
+            ObjectGuid nethekurseDoor2GUID;
        };
 };

--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -48,13 +48,13 @@ class instance_the_eye : public InstanceMapScript
        {
            instance_the_eye_InstanceMapScript(Map* map) : InstanceScript(map) { }

-            uint64 ThaladredTheDarkener;
-            uint64 LordSanguinar;
-            uint64 GrandAstromancerCapernian;
-            uint64 MasterEngineerTelonicus;
-            uint64 Kaelthas;
-            uint64 Astromancer;
-            uint64 Alar;
+            ObjectGuid ThaladredTheDarkener;
+            ObjectGuid LordSanguinar;
+            ObjectGuid GrandAstromancerCapernian;
+            ObjectGuid MasterEngineerTelonicus;
+            ObjectGuid Kaelthas;
+            ObjectGuid Astromancer;
+            ObjectGuid Alar;
            uint8 KaelthasEventPhase;
            uint8 AlarEventPhase;

@@ -65,14 +65,6 @@ class instance_the_eye : public InstanceMapScript
                SetHeaders(DataHeader);
                memset(&m_auiEncounter, 0, sizeof(m_auiEncounter));

-                ThaladredTheDarkener = 0;
-                LordSanguinar = 0;
-                GrandAstromancerCapernian = 0;
-                MasterEngineerTelonicus = 0;
-                Kaelthas = 0;
-                Astromancer = 0;
-                Alar = 0;
-
                KaelthasEventPhase = 0;
                AlarEventPhase = 0;
            }
@@ -126,7 +118,7 @@ class instance_the_eye : public InstanceMapScript
                case DATA_ASTROMANCER:                  return Astromancer;
                case DATA_ALAR:                         return Alar;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

            void SetData(uint32 type, uint32 data) override
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -39,14 +39,8 @@ class instance_arcatraz : public InstanceMapScript
                SetBossNumber(EncounterCount);
                LoadDoorData(doorData);

-                DalliahGUID       = 0;
-                SoccothratesGUID  = 0;
-                MellicharGUID     = 0;
-                WardensShieldGUID = 0;
-
                ConversationState = NOT_STARTED;

-                memset(StasisPodGUIDs, 0, 5 * sizeof(uint64));
                memset(StasisPodStates, NOT_STARTED, 5 * sizeof(uint8));
            }

@@ -166,7 +160,7 @@ class instance_arcatraz : public InstanceMapScript
                    default:
                        break;
                }
-                return 0;
+                return ObjectGuid::Empty;
            }

            bool SetBossState(uint32 type, EncounterState state) override
@@ -193,11 +187,11 @@ class instance_arcatraz : public InstanceMapScript
            }

        protected:
-            uint64 DalliahGUID;
-            uint64 SoccothratesGUID;
-            uint64 StasisPodGUIDs[5];
-            uint64 MellicharGUID;
-            uint64 WardensShieldGUID;
+            ObjectGuid DalliahGUID;
+            ObjectGuid SoccothratesGUID;
+            ObjectGuid StasisPodGUIDs[5];
+            ObjectGuid MellicharGUID;
+            ObjectGuid WardensShieldGUID;

            uint8 ConversationState;
            uint8 StasisPodStates[5];
--- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
@@ -29,11 +29,6 @@ class instance_the_botanica : public InstanceMapScript
            instance_the_botanica_InstanceMapScript(Map* map) : InstanceScript(map)
            {
                SetHeaders(DataHeader);
-                CommanderSarannisGUID       = 0;
-                HighBotanistFreywinnGUID    = 0;
-                ThorngrinTheTenderGUID      = 0;
-                LajGUID                     = 0;
-                WarpSplinterGUID            = 0;
            }

            void OnCreatureCreate(Creature* creature) override
@@ -78,7 +73,7 @@ class instance_the_botanica : public InstanceMapScript
                        break;
                }

-                return 0;
+                return ObjectGuid::Empty;
            }

            bool SetBossState(uint32 type, EncounterState state) override
@@ -102,11 +97,11 @@ class instance_the_botanica : public InstanceMapScript
            }

        protected:
-            uint64 CommanderSarannisGUID;
-            uint64 HighBotanistFreywinnGUID;
-            uint64 ThorngrinTheTenderGUID;
-            uint64 LajGUID;
-            uint64 WarpSplinterGUID;
+            ObjectGuid CommanderSarannisGUID;
+            ObjectGuid HighBotanistFreywinnGUID;
+            ObjectGuid ThorngrinTheTenderGUID;
+            ObjectGuid LajGUID;
+            ObjectGuid WarpSplinterGUID;
        };

        InstanceScript* GetInstanceScript(InstanceMap* map) const override