diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-10-18 00:32:39 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-10-18 00:32:39 +0200 |
| commit | 35bd9357799b55fef314618a674aa73957765c8e (patch) | |
| tree | 2ca9cd382209b35df1fba9b4538037738910353c /src/server/game/Mails/Mail.cpp | |
| parent | 69a17346d477be337c288145ec9da8a019ed040e (diff) | |
| parent | a147770702179273ddd26983d649fa8a54ed6f85 (diff) | |
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
Diffstat (limited to 'src/server/game/Mails/Mail.cpp')
| -rw-r--r-- | src/server/game/Mails/Mail.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp index 2459e468c25..820a54b9760 100644 --- a/src/server/game/Mails/Mail.cpp +++ b/src/server/game/Mails/Mail.cpp @@ -131,7 +131,7 @@ void MailDraft::deleteIncludedItems(SQLTransaction& trans, bool inDB /*= false*/ void MailDraft::SendReturnToSender(uint32 sender_acc, uint32 sender_guid, uint32 receiver_guid, SQLTransaction& trans) { ObjectGuid receiverGuid(HIGHGUID_PLAYER, receiver_guid); - Player* receiver = ObjectAccessor::FindPlayer(receiverGuid); + Player* receiver = ObjectAccessor::FindConnectedPlayer(receiverGuid); uint32 rc_account = 0; if (!receiver) |