Core/Maps: fix being able to be ported to an instance while in a group with a temporary save. was causing some issues.

This commit is contained in:
Kandera
2012-10-05 13:34:32 -04:00
parent 2e247bd99a
commit 21164bd93d

View File

@@ -2415,7 +2415,7 @@ bool InstanceMap::AddPlayerToMap(Player* player)
{
// solo saves should be reset when entering a group
InstanceGroupBind* groupBind = group->GetBoundInstance(this);
if (playerBind)
if (playerBind && playerBind->save != mapSave)
{
sLog->outError(LOG_FILTER_MAPS, "InstanceMap::Add: player %s(%d) is being put into instance %d, %d, %d, %d, %d, %d but he is in group %d and is bound to instance %d, %d, %d, %d, %d, %d!", player->GetName(), player->GetGUIDLow(), mapSave->GetMapId(), mapSave->GetInstanceId(), mapSave->GetDifficulty(), mapSave->GetPlayerCount(), mapSave->GetGroupCount(), mapSave->CanReset(), GUID_LOPART(group->GetLeaderGUID()), playerBind->save->GetMapId(), playerBind->save->GetInstanceId(), playerBind->save->GetDifficulty(), playerBind->save->GetPlayerCount(), playerBind->save->GetGroupCount(), playerBind->save->CanReset());
if (groupBind)