From 4e673836212424cef55503b852f56aab6b1c4354 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 5 Apr 2016 20:35:59 +0200 Subject: Merge branch '3.3.5-instanceextend' into 3.3.5 (PR #16392) (cherry picked from commit 62aff401f687b56d720a320778950e82b65fbd8b) --- src/server/game/Groups/Group.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/server/game/Groups/Group.cpp') diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 494b3e4582e..b95a235bcb6 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -727,7 +727,8 @@ void Group::ConvertLeaderInstancesToGroup(Player* player, Group* group, bool swi for (Player::BoundInstancesMap::iterator itr = player->m_boundInstances[i].begin(); itr != player->m_boundInstances[i].end();) { if (!switchLeader || !group->GetBoundInstance(itr->second.save->GetDifficultyID(), itr->first)) - group->BindToInstance(itr->second.save, itr->second.perm, false); + if (itr->second.extendState) // not expired + group->BindToInstance(itr->second.save, itr->second.perm, false); // permanent binds are not removed if (switchLeader && !itr->second.perm) -- cgit v1.2.3