diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp index 22c1a5b1a..d1dee730c 100644 --- a/src/game/Channel.cpp +++ b/src/game/Channel.cpp @@ -626,7 +626,7 @@ void Channel::Invite(uint64 p, const char *newname) SendToOne(&data, newp->GetGUID()); data.clear(); } - MakePlayerInvited(&data, newp->GetGUID()); + MakePlayerInvited(&data, newp->GetName()); SendToOne(&data, p); } @@ -916,13 +916,8 @@ void Channel::MakeNotModerated(WorldPacket *data) } // done 0x1D -void Channel::MakePlayerInvited(WorldPacket *data, uint64 guid) +void Channel::MakePlayerInvited(WorldPacket *data, const std::string& name) { - std::string name; - - if(!objmgr.GetPlayerNameByGUID(guid, name) || name.empty()) - return; // player name not found - MakeNotifyPacket(data, CHAT_PLAYER_INVITED_NOTICE); *data << name; } diff --git a/src/game/Channel.h b/src/game/Channel.h index c3214f824..55ebf57ea 100644 --- a/src/game/Channel.h +++ b/src/game/Channel.h @@ -190,7 +190,7 @@ class Channel void MakeWrongFaction(WorldPacket *data); //? 0x1A void MakeInvalidName(WorldPacket *data); //? 0x1B void MakeNotModerated(WorldPacket *data); //? 0x1C - void MakePlayerInvited(WorldPacket *data, uint64 guid); //+ 0x1D + void MakePlayerInvited(WorldPacket *data, const std::string& name); //+ 0x1D void MakePlayerInviteBanned(WorldPacket *data, uint64 guid); //? 0x1E void MakeThrottled(WorldPacket *data); //? 0x1F void MakeNotInArea(WorldPacket *data); //? 0x20 diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index f3c8a6fdf..747b67a5e 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "6902" + #define REVISION_NR "6903" #endif // __REVISION_NR_H__