diff options
| author | Shauren <shauren.trinity@gmail.com> | 2012-06-08 14:52:52 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-06-08 14:52:52 +0200 |
| commit | 32aa983fe23ffc49ae0cf5322bae9f31beab5d47 (patch) | |
| tree | 7891c5622f0d3aa14c26655e3dfe21cf5a5b7bb7 /src/server/game/Instances/InstanceSaveMgr.cpp | |
| parent | 1c0fc0a1eea8dc5ae1581b67b94473e669375902 (diff) | |
Core/Maps: Fixed possible crash when resetting instances
Diffstat (limited to 'src/server/game/Instances/InstanceSaveMgr.cpp')
| -rwxr-xr-x | src/server/game/Instances/InstanceSaveMgr.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index 2e0d1e47c92..59bb86cb68e 100755 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -543,7 +543,10 @@ void InstanceSaveManager::_ResetInstance(uint32 mapid, uint32 instanceId) if (iMap && iMap->IsDungeon()) ((InstanceMap*)iMap)->Reset(INSTANCE_RESET_RESPAWN_DELAY); - iMap->DeleteRespawnTimes(); + if (iMap) + iMap->DeleteRespawnTimes(); + else + Map::DeleteRespawnTimesInDB(mapid, instanceId); // Free up the instance id and allow it to be reused sMapMgr->FreeInstanceId(instanceId); |