diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-29 17:32:12 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-06-29 17:32:12 +0200 |
| commit | 3cb066f6fd496e137d44aade3dbe22c14ca564fc (patch) | |
| tree | 626e3e5d927e4e7eb5fa1276fb8bd72bea8f7794 /src/server/game/Handlers/MailHandler.cpp | |
| parent | 88a3344c49a7bd7fdca40639e2cd2245a9c209cd (diff) | |
| parent | 876e9dde01265edef31eb28167dd82797800bb1f (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/ArenaScore.h
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundScore.h
src/server/game/Handlers/MailHandler.cpp
Diffstat (limited to 'src/server/game/Handlers/MailHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MailHandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp index 10b7541f5dd..1359032080b 100644 --- a/src/server/game/Handlers/MailHandler.cpp +++ b/src/server/game/Handlers/MailHandler.cpp @@ -383,6 +383,10 @@ void WorldSession::HandleSendMail(WorldPacket& recvData) if (guild->GetLevel() >= 17 && guild->IsMember(receiverGuid)) deliver_delay = 0; + // don't ask for COD if there are no items + if (items_count == 0) + COD = 0; + // will delete item or place to receiver mail list draft .AddMoney(money) |