diff options
| author | Faq <ainarsh@gmail.com> | 2012-08-21 10:58:15 +0300 |
|---|---|---|
| committer | Faq <ainarsh@gmail.com> | 2012-08-21 10:58:15 +0300 |
| commit | 291b0899c503bc7bf7d8463a984fd8b638867eda (patch) | |
| tree | 7a76f1ec88a89adf5d79bf8e1ba670baa8d56745 /src/server/game/Handlers/MiscHandler.cpp | |
| parent | c400923a1a96e458ca8b33b6979abc6b344cb41f (diff) | |
| parent | 542521a026031764ddd98518e7f5bdab91bc0ebb (diff) | |
Merge remote-tracking branch 'upstream/master' into SpellMasks_0
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
| -rwxr-xr-x | 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 02b0ef9fc05..bb0ca39fa37 100755 --- 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 & recv_data) { @@ -1692,6 +1694,12 @@ void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recv_data*/) 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; |