aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWarpten <vertozor@gmail.com>2013-07-26 01:58:05 +0200
committerWarpten <vertozor@gmail.com>2013-07-26 01:58:42 +0200
commit6ca3723f0efb764bede88bc97a31473aca422fc9 (patch)
treeafb96a44e0dff4aa6d27b7c49901711a83c75a31
parentdc175a2a4c21c7c1380d91777e8890d24e6ab383 (diff)
Core/Guilds: Fixed "Guild Mail" perk.
-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..c86e9ad6f56 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))
+ delivery_delay = 0;
+
// will delete item or place to receiver mail list
draft
.AddMoney(money)