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
This commit is contained in:
commit
3cb066f6fd
7 files changed
+178
-67
No files matched your search
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user