From 9fe3a501cc0f2d272e40e1319ba19eaf1c527173 Mon Sep 17 00:00:00 2001
From: Machiavelli <none@none>
Date: Mon, 15 Feb 2010 10:17:33 +0100
Subject: [PATCH] Fix in outgoing MSG_QUERY_NEXT_MAIL_TIME (the new mail
 notification icon next to the mini map): do not show the name of a player
 asociated with the mail sender GUID if the mail is not from a player
 (messagetype != MAIL_NORMAL).

--HG--
branch : trunk
---
 src/game/Mail.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp
index 64403a3b48..667b5ef19e 100644
--- a/src/game/Mail.cpp
+++ b/src/game/Mail.cpp
@@ -751,7 +751,10 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket & /*recv_data*/ )
             if (now < m->deliver_time)
                 continue;
 
-            data << uint64(m->sender);                     // sender guid
+            if (m->messageType)
+                data << uint64(m->sender); // player guid
+            else
+                data << uint32(m->sender); // creature entry
 
             switch(m->messageType)
             {