diff options
| author | Kandera <KanderaDev@gmail.com> | 2012-10-05 13:34:32 -0400 |
|---|---|---|
| committer | Kandera <KanderaDev@gmail.com> | 2012-10-05 13:34:32 -0400 |
| commit | 21164bd93d7bdc9123fd49658c8bb38707ad2b89 (patch) | |
| tree | 4fa8ba1f1bc09f0cf463467555119c20c4cfccd1 | |
| parent | 2e247bd99a535f0cf9ebc150e42cf812165d3e6f (diff) | |
Core/Maps: fix being able to be ported to an instance while in a group with a temporary save. was causing some issues.
| -rwxr-xr-x | src/server/game/Maps/Map.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index aee516f6f1d..bc524c720f7 100755 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -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) |