From 513dab074022a25cf3451a9daee3ba2f4b184866 Mon Sep 17 00:00:00 2001 From: Axel Cocat Date: Sun, 22 Jan 2023 20:15:34 +0100 Subject: [PATCH] feat(Core/Mail): call CanSendMail() even if no items are sent (#14435) * feat(Core/Mail): call CanSendMail() even if no items are sent * Update src/server/game/Handlers/MailHandler.cpp Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com> Co-authored-by: Kitzunu <24550914+Kitzunu@users.noreply.github.com> --- src/server/game/Handlers/MailHandler.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 5eb4e15c4..a2217dbfd 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -269,12 +269,19 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) if (!sScriptMgr->CanSendMail(player, receiverGuid, mailbox, subject, body, money, COD, item)) { + player->SendMailResult(0, MAIL_SEND, MAIL_ERR_INTERNAL_ERROR); return; } items[i] = item; } + if (!items_count && !sScriptMgr->CanSendMail(player, receiverGuid, mailbox, subject, body, money, COD, nullptr)) + { + player->SendMailResult(0, MAIL_SEND, MAIL_ERR_INTERNAL_ERROR); + return; + } + player->SendMailResult(0, MAIL_SEND, MAIL_OK); player->ModifyMoney(-int32(reqmoney));