From 75201f56ce7f9e4ddc2a5dbc4b8827485c2bf128 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Fri, 2 Feb 2024 15:06:24 -0500 Subject: [PATCH] Core/Mail: Moved gold check closer to where it is taken away Port From (https://github.com/TrinityCore/TrinityCore/commit/1dcb2904d5b5a6c12f5f3b56e44c74e4a79b9626) --- Source/Game/Handlers/MailHandler.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Game/Handlers/MailHandler.cs b/Source/Game/Handlers/MailHandler.cs index 704dbefbe..04d59907e 100644 --- a/Source/Game/Handlers/MailHandler.cs +++ b/Source/Game/Handlers/MailHandler.cs @@ -121,17 +121,17 @@ namespace Game return; } - if (!player.HasEnoughMoney(reqmoney) && !player.IsGameMaster()) - { - player.SendMailResult(0, MailResponseType.Send, MailResponseResult.NotEnoughMoney); - return; - } - void mailCountCheckContinuation(Team receiverTeam, ulong mailsCount, uint receiverLevel, uint receiverAccountId, uint receiverBnetAccountId) { if (_player != player) return; + if (!player.HasEnoughMoney(reqmoney) && !player.IsGameMaster()) + { + player.SendMailResult(0, MailResponseType.Send, MailResponseResult.NotEnoughMoney); + return; + } + // do not allow to have more than 100 mails in mailbox.. mails count is in opcode uint8!!! - so max can be 255.. if (mailsCount > 100) { @@ -478,7 +478,7 @@ namespace Game { new MailDraft(m.subject, "") .AddMoney(m.COD) - .SendMailTo(trans, new MailReceiver(receiver, m.sender), new MailSender( MailMessageType.Normal, m.receiver), MailCheckMask.CodPayment); + .SendMailTo(trans, new MailReceiver(receiver, m.sender), new MailSender(MailMessageType.Normal, m.receiver), MailCheckMask.CodPayment); } player.ModifyMoney(-(long)m.COD); @@ -549,7 +549,7 @@ namespace Game var mails = player.GetMails(); MailListResult response = new(); - long curTime = GameTime.GetGameTime(); + long curTime = GameTime.GetGameTime(); foreach (Mail m in mails) {