diff options
| author | Shauren <shauren.trinity@gmail.com> | 2014-10-21 21:09:15 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2025-09-28 23:29:04 +0200 |
| commit | 7eab6a791ae1c039de67a80ff8bd125bf69f7ba4 (patch) | |
| tree | 33fdc30d2a282d93ff0fbd1612228c394adfa6a0 /src/server/game/Handlers/GroupHandler.cpp | |
| parent | 75f036976410811d3c2629ddcddd279beb2dafb8 (diff) | |
Core/Entities: Final batch of removing implicit conversions of ObjectGuid to uint64
(cherry picked from commit 68f45e87345ff85341f835f0372f2a62b89f24d9)
Diffstat (limited to 'src/server/game/Handlers/GroupHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/GroupHandler.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index 0ab9dd34b3a..895570999e9 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -498,7 +498,7 @@ void WorldSession::HandleMinimapPingOpcode(WorldPacket& recvData) // everything's fine, do it WorldPacket data(MSG_MINIMAP_PING, (8+4+4)); - data << uint64(GetPlayer()->GetGUID()); + data << GetPlayer()->GetGUID(); data << float(x); data << float(y); GetPlayer()->GetGroup()->BroadcastPacket(&data, true, -1, GetPlayer()->GetGUID()); @@ -697,7 +697,7 @@ void WorldSession::HandleRaidReadyCheckOpcode(WorldPacket& recvData) // everything's fine, do it WorldPacket data(MSG_RAID_READY_CHECK_CONFIRM, 9); - data << uint64(GetPlayer()->GetGUID()); + data << GetPlayer()->GetGUID(); data << uint8(state); group->BroadcastReadyCheck(&data); } @@ -813,7 +813,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke if (pet) *data << pet->GetGUID(); else - *data << uint64(0); + *data << ObjectGuid::Empty; } if (mask & GROUP_UPDATE_FLAG_PET_NAME) @@ -993,7 +993,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket &recvData) data.put<uint64>(maskPos, auraMask); // GROUP_UPDATE_FLAG_AURAS if (updateFlags & GROUP_UPDATE_FLAG_PET_GUID) - data << uint64(ASSERT_NOTNULL(pet)->GetGUID()); + data << ASSERT_NOTNULL(pet)->GetGUID(); data << std::string(pet ? pet->GetName() : ""); // GROUP_UPDATE_FLAG_PET_NAME data << uint16(pet ? pet->GetDisplayId() : 0); // GROUP_UPDATE_FLAG_PET_MODEL_ID |