From ec9c5b19ac81b238d66794c0a766e3d412600d5d Mon Sep 17 00:00:00 2001 From: treeston Date: Wed, 21 Sep 2016 15:36:21 +0200 Subject: Map/InstanceMap: Ease up on a somewhat overzealous error message regarding instance saves. (cherry picked from commit 820e8433917fe27c4a1093482532c6986b519e1f) # Conflicts: # src/server/game/Maps/Map.cpp --- src/server/game/Maps/Map.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 9acccfef64c..d9f017ea8f8 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -3547,7 +3547,14 @@ void InstanceMap::PermBindAllPlayers() InstancePlayerBind* bind = player->GetBoundInstance(save->GetMapId(), save->GetDifficultyID()); if (bind && bind->perm) { - TC_LOG_ERROR("maps", "Player (GUID: " UI64FMTD ", Name: %s) is in instance map (Name: %s, Entry: %u, Difficulty: %u, ID: %u) that is being bound, but already has a save for the map on ID %u!", player->GetGUID().GetCounter(), player->GetName().c_str(), GetMapName(), GetId(), GetDifficultyID(), GetInstanceId(), save->GetInstanceId()); + if (bind->save && bind->save->GetInstanceId() != save->GetInstanceId()) + { + TC_LOG_ERROR("maps", "Player (GUID: " UI64FMTD ", Name: %s) is in instance map (Name: %s, Entry: %u, Difficulty: %u, ID: %u) that is being bound, but already has a save for the map on ID %u!", player->GetGUID().GetCounter(), player->GetName().c_str(), GetMapName(), save->GetMapId(), save->GetDifficultyID(), save->GetInstanceId(), bind->save->GetInstanceId()); + } + else if (!bind->save) + { + TC_LOG_ERROR("maps", "Player (GUID: " UI64FMTD ", Name: %s) is in instance map (Name: %s, Entry: %u, Difficulty: %u, ID: %u) that is being bound, but already has a bind (without associated save) for the map!", player->GetGUID().GetCounter(), player->GetName().c_str(), GetMapName(), save->GetMapId(), save->GetDifficultyID(), save->GetInstanceId()); + } } else { -- cgit v1.2.3