josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/MailSystem: Fixed building unread mail notifications, will now display properly for non-player senders (achievement rewards/auctions)

Browse Source
This commit is contained in:
Shauren
2012-07-19 15:34:21 +02:00
parent 4df39dae95
commit 8d18bae5c8
1 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Handlers/MailHandler.cpp
+19 -25
View File
@@ -573,8 +573,8 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data)
for (PlayerMails::iterator itr = player->GetMailBegin(); itr != player->GetMailEnd(); ++itr) for (PlayerMails::iterator itr = player->GetMailBegin(); itr != player->GetMailEnd(); ++itr)
{ {
// packet send mail count as uint8, prevent overflow // Only first 50 mails are displayed
if (mailsCount >= 254) if (mailsCount >= 50)
{ {
realCount += 1; realCount += 1;
continue; continue;
@@ -586,7 +586,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data)
uint8 item_count = (*itr)->items.size(); // max count is MAX_MAIL_ITEMS (12) uint8 item_count = (*itr)->items.size(); // max count is MAX_MAIL_ITEMS (12)
size_t next_mail_size = 2+4+1+((*itr)->messageType == MAIL_NORMAL ? 8 : 4)+4*8+((*itr)->subject.size()+1)+((*itr)->body.size()+1)+1+item_count*(1+4+4+7*3*4+4+4+4+4+4+4+1); size_t next_mail_size = 2+4+1+((*itr)->messageType == MAIL_NORMAL ? 8 : 4)+4*8+((*itr)->subject.size()+1)+((*itr)->body.size()+1)+1+item_count*(1+4+4+MAX_INSPECTED_ENCHANTMENT_SLOT*3*4+4+4+4+4+4+4+1);
if (data.wpos()+next_mail_size > maxPacketSize) if (data.wpos()+next_mail_size > maxPacketSize)
{ {
@@ -655,8 +655,8 @@ void WorldSession::HandleGetMailList(WorldPacket & recv_data)
data << uint8(0); data << uint8(0);
} }
realCount += 1; ++realCount;
mailsCount += 1; ++mailsCount;
} }
data.put<uint32>(0, realCount); // this will display warning about undelivered mail to player if realCount > mailsCount data.put<uint32>(0, realCount); // this will display warning about undelivered mail to player if realCount > mailsCount
@@ -743,11 +743,12 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket & /*recv_data*/)
if (_player->unReadMails > 0) if (_player->unReadMails > 0)
{ {
data << uint32(0); // float data << float(0); // float
data << uint32(0); // count data << uint32(0); // count
uint32 count = 0; uint32 count = 0;
time_t now = time(NULL); time_t now = time(NULL);
std::set<uint32> sentSenders;
for (PlayerMails::iterator itr = _player->GetMailBegin(); itr != _player->GetMailEnd(); ++itr) for (PlayerMails::iterator itr = _player->GetMailBegin(); itr != _player->GetMailEnd(); ++itr)
{ {
Mail* m = (*itr); Mail* m = (*itr);
@@ -759,36 +760,29 @@ void WorldSession::HandleQueryNextMailTime(WorldPacket & /*recv_data*/)
if (now < m->deliver_time) if (now < m->deliver_time)
continue; continue;
if (m->messageType) // only send each mail sender once
data << uint64(m->sender); // player guid if (sentSenders.count(m->sender))
else continue;
data << uint32(m->sender); // creature entry
switch (m->messageType) data << uint64(m->messageType == MAIL_NORMAL ? m->sender : 0); // player guid
{ data << uint32(m->messageType != MAIL_NORMAL ? m->sender : 0); // non-player entries
case MAIL_AUCTION: data << uint32(m->messageType);
data << uint32(2);
data << uint32(2);
data << uint32(m->stationery); data << uint32(m->stationery);
break; data << float(m->deliver_time - now);
default:
data << uint32(0);
data << uint32(0);
data << uint32(m->stationery);
break;
}
data << uint32(0xC6000000); // float unk, time or something
sentSenders.insert(m->sender);
++count; ++count;
if (count == 2) // do not display more than 2 mails if (count == 2) // do not display more than 2 mails
break; break;
} }
data.put<uint32>(4, count); data.put<uint32>(4, count);
} }
else else
{ {
data << uint32(0xC7A8C000); data << float(-DAY);
data << uint32(0x00000000); data << uint32(0);
} }
SendPacket(&data); SendPacket(&data);
} }