From 363bc3f0f0a7982d200e9d81c6d45ccddf011ced Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Thu, 1 Jan 2009 22:28:53 -0600
Subject: *Temp fix for instancemap::add crash. By Visagalis.

--HG--
branch : trunk
---
 src/game/Map.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 0bf1d5b7bf2..6e01788ac58 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -1778,7 +1778,9 @@ 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());
-                    player->UnbindInstance(GetId(), GetSpawnMode());
+                    sLog.outError("InstanceMap::Add: do not let player %s enter instance otherwise crash will happen", player->GetName());
+                    return false;
+                    //player->UnbindInstance(GetId(), GetSpawnMode());
                     //assert(false);
                 }
                 // bind to the group or keep using the group save
-- 
cgit v1.2.3