aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MiscHandler.cpp
diff options
context:
space:
mode:
authorNay <dnpd.dd@gmail.com>2012-09-11 01:13:41 +0100
committerNay <dnpd.dd@gmail.com>2012-09-11 01:13:41 +0100
commitb1c4118a33f669f8be7131c7d37b34dbe63ff545 (patch)
tree468fdf51066947dd8254753ee98163be97d0d0b8 /src/server/game/Handlers/MiscHandler.cpp
parentf237a57f51c0473bda90bae7a06bd5b9c187754b (diff)
parent8d049545de87595a84e6e2c54d7b44b354644144 (diff)
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
-rwxr-xr-xsrc/server/game/Handlers/MiscHandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 80caee7d896..aa353549c10 100755
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -1741,7 +1741,7 @@ void WorldSession::HandleHearthAndResurrect(WorldPacket& /*recv_data*/)
if (_player->isInFlight())
return;
- if(Battlefield* bf = sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId()))
+ if (/*Battlefield* bf = */sBattlefieldMgr->GetBattlefieldToZoneId(_player->GetZoneId()))
{
// bf->PlayerAskToLeave(_player); FIXME
return;