From 2b29d4e65da60d1b66fbc4ed76cfeb96aabac146 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Fri, 25 Jun 2010 21:49:27 +0200
Subject: Don't return mails to non-existing characters (thanks to laviniu for
 finding the bug)

--HG--
branch : trunk
---
 src/server/game/Mails/Mail.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Mails/Mail.cpp b/src/server/game/Mails/Mail.cpp
index 847009b83dc..77f971bf4d0 100644
--- a/src/server/game/Mails/Mail.cpp
+++ b/src/server/game/Mails/Mail.cpp
@@ -375,8 +375,8 @@ void WorldSession::HandleMailReturnToSender(WorldPacket & recv_data)
     CharacterDatabase.CommitTransaction();
     pl->RemoveMail(mailId);
 
-    // send back only to players and simple drop for other cases
-    if (m->messageType == MAIL_NORMAL)
+    // only return mail if the player exists (and delete if not existing)
+    if (m->messageType == MAIL_NORMAL && m->sender)
     {
         MailDraft draft(m->subject, m->body);
         if (m->mailTemplateId)
-- 
cgit v1.2.3