aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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)