diff options
| author | Shauren <shauren.trinity@gmail.com> | 2012-07-05 14:16:44 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2012-07-05 14:16:44 +0200 |
| commit | 32ba32c4ebe56ba931c8638460c24cd57ae29a75 (patch) | |
| tree | 2f757648b85ec8989a7dfc573b954b9b4d718650 /src/server/game/Instances/InstanceSaveMgr.cpp | |
| parent | c95905ddbb22e2b5b5362b790aa851ef10d4e27e (diff) | |
| parent | ed6f3e2deff55f913f9646db5f540b7704088478 (diff) | |
Merge branch '4.x' of github.com:TrinityCore/TrinityCore into 4.3.4
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 8078a91d082..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); - sObjectMgr->DeleteRespawnTimeForInstance(instanceId); // even if map is not loaded + if (iMap) + iMap->DeleteRespawnTimes(); + else + Map::DeleteRespawnTimesInDB(mapid, instanceId); // Free up the instance id and allow it to be reused sMapMgr->FreeInstanceId(instanceId); |