Merge branch 'master' into Playerbot

src/server/game/Entities/Creature/Creature.cpp

@@ -33,7 +33,6 @@
 #include "LootMgr.h"
 #include "ObjectMgr.h"
 #include "Opcodes.h"
-#include "OutdoorPvPMgr.h"
 #include "Pet.h"
 #include "Player.h"
 #include "PoolMgr.h"

src/server/game/Entities/Creature/Creature.h

@@ -23,7 +23,6 @@
 #include "Common.h"
 #include "CreatureData.h"
 #include "DatabaseEnv.h"
-#include "ItemTemplate.h"
 #include "LootMgr.h"
 #include "Unit.h"
 #include "World.h"

src/server/game/Entities/Creature/CreatureData.h

@@ -23,7 +23,6 @@
 #include "ItemTemplate.h"
 #include "LootMgr.h"
 #include "Unit.h"
-#include "World.h"
 #include <list>
 
 #define MAX_AGGRO_RESET_TIME 10 // in seconds

src/server/game/Entities/Item/Item.cpp

@@ -17,7 +17,6 @@
 
 #include "Item.h"
 #include "Common.h"
-#include "ConditionMgr.h"
 #include "DatabaseEnv.h"
 #include "GameTime.h"
 #include "ItemEnchantmentMgr.h"

src/server/game/Entities/Object/Position.h

@@ -20,7 +20,6 @@
 
 #include "Common.h"
 #include "G3D/Vector3.h"
-#include <cmath>
 
 class ByteBuffer;
 

src/server/game/Entities/Player/Player.cpp

@@ -11350,8 +11350,6 @@ void Player::LeaveBattleground(Battleground* bg)
     if (bg->isArena() && (bg->GetStatus() == STATUS_IN_PROGRESS || bg->GetStatus() == STATUS_WAIT_JOIN))
         sScriptMgr->OnBattlegroundDesertion(this, ARENA_DESERTION_TYPE_LEAVE_BG);
 
-    bg->RemovePlayerAtLeave(this);
-
     // xinef: reset corpse reclaim time
     m_deathExpireTime = GameTime::GetGameTime().count();
 

src/server/game/Entities/Player/PlayerStorage.cpp

@@ -22,7 +22,6 @@
 #include "Battlefield.h"
 #include "Battleground.h"
 #include "BattlegroundMgr.h"
-#include "Channel.h"
 #include "CharacterDatabaseCleaner.h"
 #include "Chat.h"
 #include "Common.h"
@@ -46,7 +45,6 @@
 #include "ObjectMgr.h"
 #include "Opcodes.h"
 #include "OutdoorPvP.h"
-#include "OutdoorPvPMgr.h"
 #include "Pet.h"
 #include "Player.h"
 #include "QueryHolder.h"