Core/Misc: Reduce differences between branches

2 files changed, 12 insertions, 10 deletions

diff --git a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
index 807109e1493..659f216fc1e 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/boss_sindragosa.cpp
@@ -648,7 +648,7 @@ struct npc_spinestalker : public ScriptedAI
         // Increase add count
         if (!me->isDead())
         {
-            _instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId()));  // this cannot be in Reset because reset also happens on evade
+            _instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId());  // this cannot be in Reset because reset also happens on evade
             Reset();
         }
     }
@@ -670,7 +670,7 @@ struct npc_spinestalker : public ScriptedAI
     void JustAppeared() override
     {
         ScriptedAI::JustAppeared();
-        _instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId()));  // this cannot be in Reset because reset also happens on evade
+        _instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId());  // this cannot be in Reset because reset also happens on evade
     }
 
     void JustDied(Unit* /*killer*/) override
@@ -773,7 +773,7 @@ struct npc_rimefang_icc : public ScriptedAI
         // Increase add count
         if (!me->isDead())
         {
-            _instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId()));  // this cannot be in Reset because reset also happens on evade
+            _instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId());  // this cannot be in Reset because reset also happens on evade
             Reset();
         }
     }
@@ -795,7 +795,7 @@ struct npc_rimefang_icc : public ScriptedAI
     void JustAppeared() override
     {
         ScriptedAI::JustAppeared();
-        _instance->SetGuidData(DATA_SINDRAGOSA_FROSTWYRMS, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId()));  // this cannot be in Reset because reset also happens on evade
+        _instance->SetData64(DATA_SINDRAGOSA_FROSTWYRMS, me->GetSpawnId());  // this cannot be in Reset because reset also happens on evade
     }
 
     void JustDied(Unit* /*killer*/) override
@@ -929,7 +929,7 @@ struct npc_sindragosa_trash : public ScriptedAI
         if (!me->isDead())
         {
             if (me->GetEntry() == NPC_FROSTWING_WHELP)
-                _instance->SetGuidData(_frostwyrmId, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId()));  // this cannot be in Reset because reset also happens on evade
+                _instance->SetData64(_frostwyrmId, me->GetSpawnId());  // this cannot be in Reset because reset also happens on evade
             Reset();
         }
     }
@@ -952,7 +952,7 @@ struct npc_sindragosa_trash : public ScriptedAI
 
         // Increase add count
         if (me->GetEntry() == NPC_FROSTWING_WHELP)
-            _instance->SetGuidData(_frostwyrmId, ObjectGuid::Create<HighGuid::Creature>(631, me->GetEntry(), me->GetSpawnId()));  // this cannot be in Reset because reset also happens on evade
+            _instance->SetData64(_frostwyrmId, me->GetSpawnId());  // this cannot be in Reset because reset also happens on evade
     }
 
     void SetData(uint32 type, uint32 data) override
diff --git a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
index e4de05aa1f5..5ea4c256ab5 100644
--- a/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
+++ b/src/server/scripts/Northrend/IcecrownCitadel/instance_icecrown_citadel.cpp
@@ -1015,18 +1015,20 @@ class instance_icecrown_citadel : public InstanceMapScript
                 }
             }
 
-            void SetGuidData(uint32 type, ObjectGuid guid) override
+            void SetData64(uint32 type, uint64 data) override
             {
                 switch (type)
                 {
                     case DATA_SINDRAGOSA_FROSTWYRMS:
-                        FrostwyrmGUIDs.insert(guid.GetCounter());
+                        FrostwyrmGUIDs.insert(data);
                         break;
                     case DATA_SPINESTALKER:
-                        SpinestalkerTrash.insert(guid.GetCounter());
+                        SpinestalkerTrash.insert(data);
                         break;
                     case DATA_RIMEFANG:
-                        RimefangTrash.insert(guid.GetCounter());
+                        RimefangTrash.insert(data);
+                        break;
+                    default:
                         break;
                 }
             }