aboutsummaryrefslogtreecommitdiff
path: root/src/game/Map.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2008-12-30 20:05:36 -0600
committermegamage <none@none>2008-12-30 20:05:36 -0600
commitaa3b89d7764c093ba87ee2cf99775e3aedc37637 (patch)
treef6a403e42332dab84f77d7a611dc375083452875 /src/game/Map.cpp
parent05301f91b90fc029af6df5717a6b48f0e1759008 (diff)
parent12d4ce413e7b3b9d697b160bac6c918564b2fd1e (diff)
*Update to HG 714.
--HG-- branch : trunk
Diffstat (limited to 'src/game/Map.cpp')
-rw-r--r--src/game/Map.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index c1673b1082d..802b0f7feec 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1778,7 +1778,8 @@ bool InstanceMap::Add(Player *player)
{
sLog.outError("InstanceMap::Add: player %s(%d) is being put in 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(pGroup->GetLeaderGUID()), playerBind->save->GetMapId(), playerBind->save->GetInstanceId(), playerBind->save->GetDifficulty(), playerBind->save->GetPlayerCount(), playerBind->save->GetGroupCount(), playerBind->save->CanReset());
if(groupBind) sLog.outError("InstanceMap::Add: the group is bound to instance %d,%d,%d,%d,%d,%d", groupBind->save->GetMapId(), groupBind->save->GetInstanceId(), groupBind->save->GetDifficulty(), groupBind->save->GetPlayerCount(), groupBind->save->GetGroupCount(), groupBind->save->CanReset());
- assert(false);
+ player->UnbindInstance(GetId(), GetSpawnMode());
+ //assert(false);
}
// bind to the group or keep using the group save
if(!groupBind)