mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-16 04:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[10402] Use ObjectGuid in packets and fix some uint32 guids cases.

Browse source
This commit is contained in:
VladimirMangos 2010-08-23 12:28:06 +04:00
parent c545392f2e
commit 09b03b470e
24 changed files with 77 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Guild.cpp
View file

@ -733,7 +733,7 @@ void Guild::Roster(WorldSession *session /*= NULL*/)
{
if (Player *pl = ObjectAccessor::FindPlayer(ObjectGuid(HIGHGUID_PLAYER, itr->first)))
{
data << uint64(pl->GetGUID());
data << pl->GetObjectGuid();
data << uint8(1);
data << pl->GetName();
data << uint32(itr->second.RankId);
@ -838,10 +838,10 @@ void Guild::DisplayGuildEventLog(WorldSession *session)
// Event type
data << uint8(itr->EventType);
// Player 1
data << uint64(itr->PlayerGuid1);
data << ObjectGuid(HIGHGUID_PLAYER, itr->PlayerGuid1);
// Player 2 not for left/join guild events
if (itr->EventType != GUILD_EVENT_LOG_JOIN_GUILD && itr->EventType != GUILD_EVENT_LOG_LEAVE_GUILD)
data << uint64(itr->PlayerGuid2);
data << ObjectGuid(HIGHGUID_PLAYER, itr->PlayerGuid2);
// New Rank - only for promote/demote guild events
if (itr->EventType == GUILD_EVENT_LOG_PROMOTE_PLAYER || itr->EventType == GUILD_EVENT_LOG_DEMOTE_PLAYER)
data << uint8(itr->NewRank);