From 100d847483e95be2dff12139ad380348fbe6d99f Mon Sep 17 00:00:00 2001 From: MitchesD Date: Tue, 28 Jul 2015 19:09:20 +0200 Subject: [PATCH] Core/PacketIO: fixed instance binding of gamemasters (cherry picked from commit 231fb1d322bc1c91f9227d43d3ef672605232154) (cherry picked from commit a968595977b3c2f738a666cd270a00b75e54bf62) --- src/server/game/Entities/Player/Player.cpp | 8 +++++--- src/server/game/Maps/Map.cpp | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 09472ffdd5f..533505c8342 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -19011,9 +19011,11 @@ void Player::BindToInstance() WorldPacket data(SMSG_INSTANCE_SAVE_CREATED, 4); data << uint32(0); GetSession()->SendPacket(&data); - BindToInstance(mapSave, true); - - GetSession()->SendCalendarRaidLockout(mapSave, true); + if (!IsGameMaster()) + { + BindToInstance(mapSave, true); + GetSession()->SendCalendarRaidLockout(mapSave, true); + } } void Player::SetPendingBind(uint32 instanceId, uint32 bindTimer) diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index bed60182a0c..866dc8699d3 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3251,8 +3251,8 @@ void InstanceMap::PermBindAllPlayers(Player* source) WorldPacket data(SMSG_INSTANCE_SAVE_CREATED, 4); data << uint32(0); player->GetSession()->SendPacket(&data); - - player->GetSession()->SendCalendarRaidLockout(save, true); + if (!player->IsGameMaster()) + player->GetSession()->SendCalendarRaidLockout(save, true); } // if the leader is not in the instance the group will not get a perm bind