Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/DungeonFinding/LFGMgr.cpp src/server/game/Handlers/ChatHandler.cpp src/server/game/Handlers/GroupHandler.cpp src/server/game/Handlers/LFGHandler.cpp src/server/game/Handlers/PetitionsHandler.cpp
This commit is contained in:
commit
35bd935779
46 files changed
+743
-174
No files matched your search
@@ -33,7 +33,7 @@
|
||||
|
||||
void WorldSession::SendNameQueryOpcode(ObjectGuid guid)
|
||||
{
|
||||
Player* player = ObjectAccessor::FindPlayer(guid);
|
||||
Player* player = ObjectAccessor::FindConnectedPlayer(guid);
|
||||
CharacterNameData const* nameData = sWorld->GetCharacterNameData(guid);
|
||||
|
||||
WorldPacket data(SMSG_NAME_QUERY_RESPONSE, (8+1+1+1+1+1+10));
|
||||
|
||||
Reference in new issue
Block a user