diff --git a/Source/Game/Handlers/MailHandler.cs b/Source/Game/Handlers/MailHandler.cs index 8c6643e91..a312ecc11 100644 --- a/Source/Game/Handlers/MailHandler.cs +++ b/Source/Game/Handlers/MailHandler.cs @@ -186,6 +186,13 @@ namespace Game return; } + // handle empty bag before CanBeTraded, since that func already has that check + if (item.IsNotEmptyBag()) + { + player.SendMailResult(0, MailResponseType.Send, MailResponseResult.EquipError, InventoryResult.DestroyNonemptyBag); + return; + } + if (!item.CanBeTraded(true)) { player.SendMailResult(0, MailResponseType.Send, MailResponseResult.EquipError, InventoryResult.MailBoundItem); @@ -213,12 +220,6 @@ namespace Game return; } - if (item.IsNotEmptyBag()) - { - player.SendMailResult(0, MailResponseType.Send, MailResponseResult.EquipError, InventoryResult.DestroyNonemptyBag); - return; - } - items.Add(item); }