aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/MiscHandler.cpp
diff options
context:
space:
mode:
authorMitchesD <majklprofik@seznam.cz>2015-07-28 19:09:20 +0200
committerMitchesD <majklprofik@seznam.cz>2015-07-28 19:09:20 +0200
commit231fb1d322bc1c91f9227d43d3ef672605232154 (patch)
tree58a684167fe8455445f990c7653f059fc67d0b15 /src/server/game/Handlers/MiscHandler.cpp
parent15c8e5fd4d2dcb808da162527c133c02949781ca (diff)
Core/PacketIO: updated CMSG_INSTANCE_LOCK_RESPONSE and fixed instance binding of gamemasters
Diffstat (limited to 'src/server/game/Handlers/MiscHandler.cpp')
-rw-r--r--src/server/game/Handlers/MiscHandler.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp
index 7fd5ad542ff..75c582df890 100644
--- a/src/server/game/Handlers/MiscHandler.cpp
+++ b/src/server/game/Handlers/MiscHandler.cpp
@@ -46,6 +46,7 @@
#include "MiscPackets.h"
#include "AchievementPackets.h"
#include "WhoPackets.h"
+#include "InstancePackets.h"
void WorldSession::HandleRepopRequest(WorldPackets::Misc::RepopRequest& /*packet*/)
{
@@ -1110,11 +1111,8 @@ void WorldSession::SendSetPhaseShift(std::set<uint32> const& phaseIds, std::set<
SendPacket(phaseShift.Write());
}
-void WorldSession::HandleInstanceLockResponse(WorldPacket& recvPacket)
+void WorldSession::HandleInstanceLockResponse(WorldPackets::Instance::InstanceLockResponse& packet)
{
- uint8 accept;
- recvPacket >> accept;
-
if (!_player->HasPendingBind())
{
TC_LOG_INFO("network", "InstanceLockResponse: Player %s (%s) tried to bind himself/teleport to graveyard without a pending bind!",
@@ -1122,7 +1120,7 @@ void WorldSession::HandleInstanceLockResponse(WorldPacket& recvPacket)
return;
}
- if (accept)
+ if (packet.AcceptLock)
_player->BindToInstance();
else
_player->RepopAtGraveyard();