aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2013-06-11 15:50:08 +0200
committerShauren <shauren.trinity@gmail.com>2013-06-11 15:50:08 +0200
commitef15fe8ed28cb2d65574e8c5c755d39f8a06a994 (patch)
treeb0e130efeabd77cd3799132c07a067413fe70b04 /src/server/game/Entities
parent935a1cf607782916fdb8e3a77489738a3d07b66f (diff)
Core/Instances: Fixed a bug that caused switching group leader inside active instance to cause players not being saved when a boss was killed.
Closes #5109
Diffstat (limited to 'src/server/game/Entities')
-rw-r--r--src/server/game/Entities/Player/Player.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 28213785911..a7d37dd870f 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -18698,7 +18698,9 @@ void Player::ConvertInstancesToGroup(Player* player, Group* group, bool switchLe
{
for (BoundInstancesMap::iterator itr = player->m_boundInstances[i].begin(); itr != player->m_boundInstances[i].end();)
{
- group->BindToInstance(itr->second.save, itr->second.perm, false);
+ if (!switchLeader || !group->GetBoundInstance(itr->second.save->GetDifficulty(), itr->first))
+ group->BindToInstance(itr->second.save, itr->second.perm, false);
+
// permanent binds are not removed
if (switchLeader && !itr->second.perm)
{