aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormegamage <none@none>2008-12-30 16:49:45 -0600
committermegamage <none@none>2008-12-30 16:49:45 -0600
commit8592e5606bf3d7342dc0c97df8d9e8a6206994a9 (patch)
tree7cd2792ff8b4aab49ae3f648dd98380bd7efebb7
parentb8a721c9ab111b59ef38fbb5b051d1d56104cec2 (diff)
*A temp fix for the crash caused by instance::add.
--HG-- branch : trunk
-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 c2fe5bfec74..99474bfedf9 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)