From 231fb1d322bc1c91f9227d43d3ef672605232154 Mon Sep 17 00:00:00 2001 From: MitchesD Date: Tue, 28 Jul 2015 19:09:20 +0200 Subject: Core/PacketIO: updated CMSG_INSTANCE_LOCK_RESPONSE and fixed instance binding of gamemasters --- src/server/game/Handlers/MiscHandler.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src/server/game/Handlers/MiscHandler.cpp') 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 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(); -- cgit v1.2.3