Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64

(cherry picked from commit 68f45e87345ff85341f835f0372f2a62b89f24d9)

3 files changed, 17 insertions, 17 deletions

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 7d2ec0adfab..783e27a3a8b 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -4711,7 +4711,7 @@ void Spell::SendResurrectRequest(Player* target)
         sentName = m_caster->GetNameForLocaleIdx(target->GetSession()->GetSessionDbLocaleIndex());
 
     WorldPacket data(SMSG_RESURRECT_REQUEST, 8 + 4 + sentName.size() + 1 + 1 + 1);
-    data << uint64(m_caster->GetGUID());
+    data << m_caster->GetGUID();
     data << uint32(sentName.size() + 1);
     data << sentName;
     data << uint8(m_caster->GetTypeId() == TYPEID_UNIT && m_caster->ToCreature()->IsSpiritHealer()); // "you'll be afflicted with resurrection sickness"
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 182bb113b15..4b543169854 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -284,8 +284,8 @@ void Spell::EffectInstaKill()
         finish();
 
     WorldPacket data(SMSG_SPELLINSTAKILLLOG, 8+8+4);
-    data << uint64(m_caster->GetGUID());
-    data << uint64(unitTarget->GetGUID());
+    data << m_caster->GetGUID();
+    data << unitTarget->GetGUID();
     data << uint32(m_spellInfo->Id);
     m_caster->SendMessageToSet(&data, true);
 
@@ -2322,8 +2322,8 @@ void Spell::EffectDispel()
             if (!failCount)
             {
                 // Failed to dispell
-                dataFail << uint64(m_caster->GetGUID());            // Caster GUID
-                dataFail << uint64(unitTarget->GetGUID());          // Victim GUID
+                dataFail << m_caster->GetGUID();                    // Caster GUID
+                dataFail << unitTarget->GetGUID();                  // Victim GUID
                 dataFail << uint32(m_spellInfo->Id);                // dispel spell id
             }
             ++failCount;
@@ -3679,8 +3679,8 @@ void Spell::EffectDuel()
 
     // Send request
     WorldPacket data(SMSG_DUEL_REQUESTED, 8 + 8);
-    data << uint64(pGameObj->GetGUID());
-    data << uint64(caster->GetGUID());
+    data << pGameObj->GetGUID();
+    data << caster->GetGUID();
     caster->SendDirectMessage(&data);
     target->SendDirectMessage(&data);
 
@@ -4173,7 +4173,7 @@ void Spell::EffectForceDeselect()
 
     // and selection
     data.Initialize(SMSG_CLEAR_TARGET, 8);
-    data << uint64(unitCaster->GetGUID());
+    data << unitCaster->GetGUID();
     Trinity::MessageDistDelivererToHostile notifierClear(unitCaster, &data, dist);
     Cell::VisitWorldObjects(unitCaster, notifierClear, dist);
 
@@ -4976,8 +4976,8 @@ void Spell::EffectStealBeneficialBuff()
             if (!failCount)
             {
                 // Failed to dispell
-                dataFail << uint64(m_caster->GetGUID());            // Caster GUID
-                dataFail << uint64(unitTarget->GetGUID());          // Victim GUID
+                dataFail << m_caster->GetGUID();                    // Caster GUID
+                dataFail << unitTarget->GetGUID();                  // Victim GUID
                 dataFail << uint32(m_spellInfo->Id);                // dispel spell id
             }
             ++failCount;
diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp
index d39d4e069ec..81d99047ea3 100644
--- a/src/server/game/Spells/SpellHistory.cpp
+++ b/src/server/game/Spells/SpellHistory.cpp
@@ -374,7 +374,7 @@ void SpellHistory::SendCooldownEvent(SpellInfo const* spellInfo, uint32 itemId /
         {
             WorldPacket data(SMSG_COOLDOWN_EVENT, 4 + 8);
             data << uint32(categoryItr->second->SpellId);
-            data << uint64(_owner->GetGUID());
+            data << _owner->GetGUID();
             player->SendDirectMessage(&data);
 
             if (startCooldown)
@@ -383,7 +383,7 @@ void SpellHistory::SendCooldownEvent(SpellInfo const* spellInfo, uint32 itemId /
 
         WorldPacket data(SMSG_COOLDOWN_EVENT, 4 + 8);
         data << uint32(spellInfo->Id);
-        data << uint64(_owner->GetGUID());
+        data << _owner->GetGUID();
         player->SendDirectMessage(&data);
     }
 
@@ -423,7 +423,7 @@ void SpellHistory::ModifyCooldown(uint32 spellId, int32 cooldownModMs)
     {
         WorldPacket modifyCooldown(SMSG_MODIFY_COOLDOWN, 4 + 8 + 4);
         modifyCooldown << uint32(spellId);
-        modifyCooldown << uint64(_owner->GetGUID());
+        modifyCooldown << _owner->GetGUID();
         modifyCooldown << int32(cooldownModMs);
         playerOwner->SendDirectMessage(&modifyCooldown);
     }
@@ -446,7 +446,7 @@ void SpellHistory::ResetCooldown(CooldownStorageType::iterator& itr, bool update
         {
             WorldPacket data(SMSG_CLEAR_COOLDOWN, 4 + 8);
             data << uint32(itr->first);
-            data << uint64(_owner->GetGUID());
+            data << _owner->GetGUID();
             playerOwner->SendDirectMessage(&data);
         }
     }
@@ -611,7 +611,7 @@ void SpellHistory::SendClearCooldowns(std::vector<int32> const& cooldowns) const
         {
             WorldPacket data(SMSG_CLEAR_COOLDOWN, 4 + 8);
             data << uint32(spell);
-            data << uint64(_owner->GetGUID());
+            data << _owner->GetGUID();
             playerOwner->SendDirectMessage(&data);
         }
     }
@@ -620,7 +620,7 @@ void SpellHistory::SendClearCooldowns(std::vector<int32> const& cooldowns) const
 void SpellHistory::BuildCooldownPacket(WorldPacket& data, uint8 flags, uint32 spellId, uint32 cooldown) const
 {
     data.Initialize(SMSG_SPELL_COOLDOWN, 8 + 1 + 4 + 4);
-    data << uint64(_owner->GetGUID());
+    data << _owner->GetGUID();
     data << uint8(flags);
     data << uint32(spellId);
     data << uint32(cooldown);
@@ -629,7 +629,7 @@ void SpellHistory::BuildCooldownPacket(WorldPacket& data, uint8 flags, uint32 sp
 void SpellHistory::BuildCooldownPacket(WorldPacket& data, uint8 flags, PacketCooldowns const& cooldowns) const
 {
     data.Initialize(SMSG_SPELL_COOLDOWN, 8 + 1 + (4 + 4) * cooldowns.size());
-    data << uint64(_owner->GetGUID());
+    data << _owner->GetGUID();
     data << uint8(flags);
     for (auto const& cooldown : cooldowns)
     {