sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(Core/Mail): Mailhandler cleanup (#2802)

Browse Source
This commit is contained in:
Viste
2020-04-15 13:23:30 +03:00
committed by GitHub
parent c839ce5398
commit 1432f17c32
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Common.h
+2
View File
@@ -132,6 +132,8 @@ inline bool myisfinite(float f) { return isfinite(f) && !isnan(f); }
#define STRINGIZE(a) #a #define STRINGIZE(a) #a
#define MAX_NETCLIENT_PACKET_SIZE (32767 - 1) // Client hardcap: int16 with trailing zero space otherwise crash on memory free
enum TimeConstants enum TimeConstants
{ {
MINUTE = 60, MINUTE = 60,
src/server/game/Handlers/MailHandler.cpp
+17 -11
View File
@@ -18,6 +18,8 @@
#include "Item.h" #include "Item.h"
#include "AccountMgr.h" #include "AccountMgr.h"
#define MAX_INBOX_CLIENT_CAPACITY 50
bool WorldSession::CanOpenMailBox(uint64 guid) bool WorldSession::CanOpenMailBox(uint64 guid)
{ {
if (guid == _player->GetGUID()) if (guid == _player->GetGUID())
@@ -118,6 +120,13 @@ void WorldSession::HandleSendMail(WorldPacket & recvData)
return; return;
} }
if (money && COD) // cannot send money in a COD mail
{
sLog->outError("%s attempt to dupe money!!!.", receiver.c_str());
player->SendMailResult(0, MAIL_SEND, MAIL_ERR_INTERNAL_ERROR);
return;
}
uint32 cost = items_count ? 30 * items_count : 30; // price hardcoded in client uint32 cost = items_count ? 30 * items_count : 30; // price hardcoded in client
uint32 reqmoney = cost + money; uint32 reqmoney = cost + money;
@@ -570,9 +579,6 @@ void WorldSession::HandleGetMailList(WorldPacket & recvData)
if (!player->m_mailsLoaded) if (!player->m_mailsLoaded)
player->_LoadMail(); player->_LoadMail();
// client can't work with packets > max int16 value
const uint32 maxPacketSize = 32767;
uint32 mailsCount = 0; // real send to client mails amount uint32 mailsCount = 0; // real send to client mails amount
uint32 realCount = 0; // real mails amount uint32 realCount = 0; // real mails amount
@@ -583,8 +589,8 @@ void WorldSession::HandleGetMailList(WorldPacket & recvData)
for (PlayerMails::iterator itr = player->GetMailBegin(); itr != player->GetMailEnd(); ++itr) for (PlayerMails::iterator itr = player->GetMailBegin(); itr != player->GetMailEnd(); ++itr)
{ {
// Only first 50 mails are displayed // prevent client storage overflow
if (mailsCount >= 50) if (mailsCount >= MAX_INBOX_CLIENT_CAPACITY)
{ {
realCount += 1; realCount += 1;
continue; continue;
@@ -594,11 +600,11 @@ void WorldSession::HandleGetMailList(WorldPacket & recvData)
if ((*itr)->state == MAIL_STATE_DELETED || cur_time < (*itr)->deliver_time) if ((*itr)->state == MAIL_STATE_DELETED || cur_time < (*itr)->deliver_time)
continue; continue;
uint8 item_count = (*itr)->items.size(); // max count is MAX_MAIL_ITEMS (12) uint8 item_count = uint8((*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+MAX_INSPECTED_ENCHANTMENT_SLOT*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 > MAX_NETCLIENT_PACKET_SIZE)
{ {
realCount += 1; realCount += 1;
continue; continue;
@@ -643,9 +649,9 @@ void WorldSession::HandleGetMailList(WorldPacket & recvData)
data << uint32((item ? item->GetEntry() : 0)); data << uint32((item ? item->GetEntry() : 0));
for (uint8 j = 0; j < MAX_INSPECTED_ENCHANTMENT_SLOT; ++j) for (uint8 j = 0; j < MAX_INSPECTED_ENCHANTMENT_SLOT; ++j)
{ {
data << uint32((item ? item->GetEnchantmentId((EnchantmentSlot)j) : 0)); data << uint32(item ? item->GetEnchantmentCharges(EnchantmentSlot(j)) : 0);
data << uint32((item ? item->GetEnchantmentDuration((EnchantmentSlot)j) : 0)); data << uint32(item ? item->GetEnchantmentDuration(EnchantmentSlot(j)) : 0);
data << uint32((item ? item->GetEnchantmentCharges((EnchantmentSlot)j) : 0)); data << uint32(item ? item->GetEnchantmentId(EnchantmentSlot(j)) : 0);
} }
// can be negative // can be negative
data << int32((item ? item->GetItemRandomPropertyId() : 0)); data << int32((item ? item->GetItemRandomPropertyId() : 0));
@@ -668,7 +674,7 @@ void WorldSession::HandleGetMailList(WorldPacket & recvData)
} }
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
data.put<uint8>(4, mailsCount); // set real send mails to client data.put<uint8>(4, uint8(mailsCount)); // set real send mails to client
SendPacket(&data); SendPacket(&data);
// recalculate m_nextMailDelivereTime and unReadMails // recalculate m_nextMailDelivereTime and unReadMails