diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-08-20 22:04:57 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-08-20 22:04:57 +0100 |
| commit | 354e46d9e0421e1a9b3a75956f5a57766a5045bc (patch) | |
| tree | 8f13def29d567eb1ae33841ca6d9be701c4cd5b8 /src/server/game/Handlers/MiscHandler.cpp | |
| parent | 11652278df4a48a25589392e8a5472f0dc3e9e9f (diff) | |
| parent | 9e0907874e3f461aa5650f7122af880301025b7f (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/tools/vmap4_extractor/mpq_libmpq04.h
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/MiscHandler.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index 7803a69587f..c177d8b2888 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -52,6 +52,8 @@ #include "Group.h" #include "AccountMgr.h" #include "Spell.h" +#include "Battlefield.h" +#include "BattlefieldMgr.h" void WorldSession::HandleRepopRequestOpcode(WorldPacket& recvData) { @@ -1730,6 +1732,12 @@ void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recvData*/) if (_player->isInFlight()) return; + if(Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId())) + { + // bf->PlayerAskToLeave(_player); FIXME + return; + } + AreaTableEntry const* atEntry = GetAreaEntryByAreaID(_player->GetAreaId()); if (!atEntry || !(atEntry->flags & AREA_FLAG_WINTERGRASP_2)) return; |