From 1e8ca772b34a1719cb0d339fa2c58fb239f227fa Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Sat, 15 Jan 2011 19:13:17 +0300
Subject: [PATCH] [11012] Remove battlemaster mails support as unused now.

---
 src/game/Mail.cpp         |  4 ----
 src/game/SpellEffects.cpp | 10 ----------
 src/shared/revision_nr.h  |  2 +-
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/game/Mail.cpp b/src/game/Mail.cpp
index a50d97d26..833dce7b7 100644
--- a/src/game/Mail.cpp
+++ b/src/game/Mail.cpp
@@ -38,7 +38,6 @@
 #include "Unit.h"
 #include "Language.h"
 #include "DBCStores.h"
-#include "BattleGroundMgr.h"
 #include "Item.h"
 #include "AuctionHouseMgr.h"
 
@@ -1015,9 +1014,6 @@ void MailDraft::SendMailTo(MailReceiver const& receiver, MailSender const& sende
     // auction mail without any items and money (auction sale note) pending 1 hour
     if (sender.GetMailMessageType() == MAIL_AUCTION && m_items.empty() && !m_money)
         expire_delay = HOUR;
-    // mail from battlemaster (rewardmarks) should last only one day
-    else if (sender.GetMailMessageType() == MAIL_CREATURE && sBattleGroundMgr.GetBattleMasterBG(sender.GetSenderId()) != BATTLEGROUND_TYPE_NONE)
-        expire_delay = DAY;
     // default case: expire time if COD 3 days, if no COD 30 days
     else
         expire_delay = (m_COD > 0) ? 3 * DAY : 30 * DAY;
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index 38842856e..4a044a2f6 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -3685,16 +3685,6 @@ void Spell::DoCreateItem(SpellEffectIndex eff_idx, uint32 itemtype)
         if(!bg_mark)
             player->UpdateCraftSkill(m_spellInfo->Id);
     }
-
-    // for battleground marks send by mail if not add all expected
-    // FIXME: single existing bg marks for outfield bg and we not have it..
-    /*
-    if(no_space > 0 && bg_mark)
-    {
-        if(BattleGround* bg = sBattleGroundMgr.GetBattleGroundTemplate(BattleGroundTypeId(bgType)))
-            bg->SendRewardMarkByMail(player, newitemid, no_space);
-    }
-    */
 }
 
 void Spell::EffectCreateItem(SpellEffectIndex eff_idx)
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 34525b0f4..3cd59476c 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11011"
+ #define REVISION_NR "11012"
 #endif // __REVISION_NR_H__