aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MailHandler.cpp
diff options
context:
space:
mode:
authorVincent-Michael <Vincent_Michael@gmx.de>2013-07-26 02:05:38 +0200
committerVincent-Michael <Vincent_Michael@gmx.de>2013-07-26 02:05:38 +0200
commit78cece004a6cfe67ad65e9baa803bca99360ca9f (patch)
tree5123e8105545992f5f4ad11ff1a5c179fd1fc501 /src/server/game/Handlers/MailHandler.cpp
parentc57fa8f781d0513dc07881b724bf27a758485a20 (diff)
parent104b736cbda3b24ff48820e3fe0dc41a9bfff98b (diff)
Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Handlers/MailHandler.cpp')
-rw-r--r--src/server/game/Handlers/MailHandler.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/Handlers/MailHandler.cpp b/src/server/game/Handlers/MailHandler.cpp
index cf17ee29345..48085ae8174 100644
--- a/src/server/game/Handlers/MailHandler.cpp
+++ b/src/server/game/Handlers/MailHandler.cpp
@@ -337,6 +337,11 @@ void WorldSession::HandleSendMail(WorldPacket& recvData)
// If theres is an item, there is a one hour delivery delay if sent to another account's character.
uint32 deliver_delay = needItemDelay ? sWorld->getIntConfig(CONFIG_MAIL_DELIVERY_DELAY) : 0;
+ // Mail sent between guild members arrives instantly if they have the guild perk "Guild Mail"
+ if (Guild* guild = player->GetGuild())
+ if (guild->GetLevel() >= 17 && guild->IsMember(receiverGuid))
+ deliver_delay = 0;
+
// will delete item or place to receiver mail list
draft
.AddMoney(money)