From fd17ea16431e0831be058ac1bbd7c37574d3c2e6 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 2 Oct 2015 20:00:49 +0200 Subject: Core/Players: Removed db queries from friend packet builders --- src/server/game/Server/Packets/SocialPackets.cpp | 4 ++-- src/server/game/Server/Protocol/Opcodes.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/game/Server') diff --git a/src/server/game/Server/Packets/SocialPackets.cpp b/src/server/game/Server/Packets/SocialPackets.cpp index 9f87bf4414f..815f721bf01 100644 --- a/src/server/game/Server/Packets/SocialPackets.cpp +++ b/src/server/game/Server/Packets/SocialPackets.cpp @@ -28,7 +28,7 @@ void WorldPackets::Social::SendContactList::Read() WorldPackets::Social::ContactInfo::ContactInfo(ObjectGuid const& guid, FriendInfo const& friendInfo) { Guid = guid; - WowAccountGuid = ObjectGuid::Create(ObjectMgr::GetPlayerAccountIdByGUID(guid)); + WowAccountGuid = friendInfo.WowAccountGuid; VirtualRealmAddr = GetVirtualRealmAddress(); NativeRealmAddr = GetVirtualRealmAddress(); TypeFlags = friendInfo.Flags; @@ -76,7 +76,7 @@ void WorldPackets::Social::FriendStatus::Initialize(ObjectGuid const& guid, Frie ClassID = friendInfo.Class; Status = friendInfo.Status; Guid = guid; - WowAccountGuid = ObjectGuid::Create(ObjectMgr::GetPlayerAccountIdByGUID(guid)); + WowAccountGuid = friendInfo.WowAccountGuid; Level = friendInfo.Level; AreaID = friendInfo.Area; FriendResult = result; diff --git a/src/server/game/Server/Protocol/Opcodes.cpp b/src/server/game/Server/Protocol/Opcodes.cpp index 356ccb63e7b..4637093c8a9 100644 --- a/src/server/game/Server/Protocol/Opcodes.cpp +++ b/src/server/game/Server/Protocol/Opcodes.cpp @@ -704,7 +704,7 @@ void OpcodeTable::Initialize() DEFINE_HANDLER(CMSG_SELL_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, WorldPackets::Item::SellItem, &WorldSession::HandleSellItemOpcode); DEFINE_HANDLER(CMSG_SELL_WOW_TOKEN_CONFIRM, STATUS_UNHANDLED, PROCESS_INPLACE, WorldPackets::Null, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_SELL_WOW_TOKEN_START, STATUS_UNHANDLED, PROCESS_INPLACE, WorldPackets::Null, &WorldSession::Handle_NULL); - DEFINE_HANDLER(CMSG_SEND_CONTACT_LIST, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Social::SendContactList, &WorldSession::HandleContactListOpcode); + DEFINE_HANDLER(CMSG_SEND_CONTACT_LIST, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, WorldPackets::Social::SendContactList, &WorldSession::HandleContactListOpcode); DEFINE_HANDLER(CMSG_SEND_MAIL, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, WorldPackets::Mail::SendMail, &WorldSession::HandleSendMail); DEFINE_HANDLER(CMSG_SEND_SOR_REQUEST_VIA_ADDRESS, STATUS_UNHANDLED, PROCESS_INPLACE, WorldPackets::Null, &WorldSession::Handle_NULL); DEFINE_HANDLER(CMSG_SEND_SOR_REQUEST_VIA_BNET_ACCOUNT_ID, STATUS_UNHANDLED, PROCESS_INPLACE, WorldPackets::Null, &WorldSession::Handle_NULL); -- cgit v1.2.3