Merge git://github.com/TrinityCore/TrinityCore into 4.x
Conflicts: dep/PackageList.txt sql/base/auth_database.sql src/server/authserver/Server/AuthSocket.cpp src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Chat/Commands/Level1.cpp src/server/game/Chat/Commands/Level3.cpp src/server/game/DataStores/DBCEnums.h src/server/game/DataStores/DBCStores.cpp src/server/game/DataStores/DBCStores.h src/server/game/DataStores/DBCStructure.h src/server/game/DataStores/DBCfmt.h src/server/game/Entities/Corpse/Corpse.cpp src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/DynamicObject/DynamicObject.cpp src/server/game/Entities/GameObject/GameObject.cpp src/server/game/Entities/Item/Item.cpp src/server/game/Entities/Object/Object.cpp src/server/game/Entities/Object/Updates/UpdateData.h src/server/game/Entities/Pet/Pet.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Player/Player.h src/server/game/Entities/Transport/Transport.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Globals/ObjectMgr.cpp src/server/game/Globals/ObjectMgr.h src/server/game/Guilds/Guild.cpp src/server/game/Handlers/CharacterHandler.cpp src/server/game/Handlers/MiscHandler.cpp src/server/game/Handlers/MovementHandler.cpp src/server/game/Handlers/QuestHandler.cpp src/server/game/Loot/LootMgr.cpp src/server/game/Miscellaneous/SharedDefines.h src/server/game/Quests/QuestDef.cpp src/server/game/Server/Protocol/Opcodes.cpp src/server/game/Server/Protocol/Opcodes.h src/server/game/Server/WorldSession.cpp src/server/game/Server/WorldSocket.cpp src/server/game/Spells/Auras/SpellAuraEffects.cpp src/server/game/Spells/Spell.cpp src/server/game/Spells/Spell.h src/server/game/Spells/SpellEffects.cpp src/server/game/Tickets/TicketMgr.cpp src/server/scripts/Commands/cs_gps.cpp src/server/scripts/Commands/cs_modify.cpp src/server/shared/Database/Implementation/CharacterDatabase.cpp src/server/shared/Logging/Log.h src/tools/map_extractor/CMakeLists.txt src/tools/map_extractor/System.cpp src/tools/map_extractor/mpq_libmpq04.h src/tools/vmap4_extractor/CMakeLists.txt
This commit is contained in:
1 parent
bdf6cf5146
commit
3d14384c32
1084 files changed
+31419
-17200
No files matched your search
@@ -33,42 +33,33 @@
|
||||
|
||||
void WorldSession::SendNameQueryOpcode(uint64 guid)
|
||||
{
|
||||
Player* player = NULL;
|
||||
const CharacterNameData* nameData = sWorld->GetCharacterNameData(GUID_LOPART(guid));
|
||||
if (nameData)
|
||||
player = ObjectAccessor::FindPlayer(guid);
|
||||
Player* player = ObjectAccessor::FindPlayer(guid);
|
||||
CharacterNameData const* nameData = sWorld->GetCharacterNameData(GUID_LOPART(guid));
|
||||
|
||||
// guess size
|
||||
WorldPacket data(SMSG_NAME_QUERY_RESPONSE, (8+1+1+1+1+1+10));
|
||||
data.appendPackGUID(guid);
|
||||
data << uint8(0); // added in 3.1
|
||||
if (nameData)
|
||||
if (!nameData)
|
||||
{
|
||||
data << nameData->m_name; // played name
|
||||
data << uint8(0); // realm name for cross realm BG usage
|
||||
data << uint8(nameData->m_race);
|
||||
data << uint8(nameData->m_gender);
|
||||
data << uint8(nameData->m_class);
|
||||
}
|
||||
else
|
||||
{
|
||||
data << std::string(GetTrinityString(LANG_NON_EXIST_CHARACTER));
|
||||
data << uint32(0);
|
||||
data << uint8(1); // name unknown
|
||||
SendPacket(&data);
|
||||
return;
|
||||
}
|
||||
|
||||
if (player)
|
||||
data << uint8(0); // name known
|
||||
data << nameData->m_name; // played name
|
||||
data << uint8(0); // realm name - only set for cross realm interaction (such as Battlegrounds)
|
||||
data << uint8(nameData->m_race);
|
||||
data << uint8(nameData->m_gender);
|
||||
data << uint8(nameData->m_class);
|
||||
|
||||
if (DeclinedName const* names = (player ? player->GetDeclinedNames() : NULL))
|
||||
{
|
||||
if (DeclinedName const* names = player->GetDeclinedNames())
|
||||
{
|
||||
data << uint8(1); // is declined
|
||||
for (int i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
|
||||
data << names->name[i];
|
||||
}
|
||||
else
|
||||
data << uint8(0); // is not declined
|
||||
data << uint8(1); // Name is declined
|
||||
for (uint8 i = 0; i < MAX_DECLINED_NAME_CASES; ++i)
|
||||
data << names->name[i];
|
||||
}
|
||||
else //TODO: decline names may also need to be stored in char name data
|
||||
data << uint8(0);
|
||||
else
|
||||
data << uint8(0); // Name is not declined
|
||||
|
||||
SendPacket(&data);
|
||||
}
|
||||
@@ -76,7 +67,6 @@ void WorldSession::SendNameQueryOpcode(uint64 guid)
|
||||
void WorldSession::HandleNameQueryOpcode(WorldPacket& recv_data)
|
||||
{
|
||||
uint64 guid;
|
||||
|
||||
recv_data >> guid;
|
||||
|
||||
// This is disable by default to prevent lots of console spam
|
||||
|
||||
Reference in new issue
Block a user