diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-02-10 22:23:39 +0100 |
|---|---|---|
| committer | treeston <treeston.mmoc@gmail.com> | 2016-02-10 22:23:39 +0100 |
| commit | 62aff401f687b56d720a320778950e82b65fbd8b (patch) | |
| tree | a82f939e3804fb955d54e202b07b660b68f88553 /src/server/game/Groups/Group.cpp | |
| parent | 0a725e0e21806dfd456cb66bdc0293e14f0d25ed (diff) | |
| parent | 6102a7937ddb0cf145c72fe056fc5ac4b4c3b1b5 (diff) | |
Merge branch '3.3.5-instanceextend' into 3.3.5 (PR #16392)
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 43159828a3c..99c5d610e64 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -687,7 +687,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->GetDifficulty(), 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) |