diff options
author | Machiavelli <none@none> | 2010-08-15 20:12:13 +0200 |
---|---|---|
committer | Machiavelli <none@none> | 2010-08-15 20:12:13 +0200 |
commit | bbe5b58c378f574d2e54302f7f38ccb632657a72 (patch) | |
tree | b4741980cdd82000d57c60282afccbf7e0af2a9c /src | |
parent | e8d03e55ca8eee754412d9779e54043bef6c13f6 (diff) |
Missing changes from 9372 (454971d2c6b1)
Thanks to Derex for spotting.
--HG--
branch : trunk
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Globals/ObjectMgr.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index b5d4bc352c9..2c93ba3b704 100644 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -830,9 +830,17 @@ class ObjectMgr void AddCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid, uint32 instance); void DeleteCorpseCellData(uint32 mapid, uint32 cellid, uint32 player_guid); - time_t GetCreatureRespawnTime(uint32 loguid, uint32 instance) { return mCreatureRespawnTimes[MAKE_PAIR64(loguid,instance)]; } + time_t GetCreatureRespawnTime(uint32 loguid, uint32 instance) + { + ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, m_CreatureRespawnTimesMtx, 0); + return mCreatureRespawnTimes[MAKE_PAIR64(loguid,instance)]; + } void SaveCreatureRespawnTime(uint32 loguid, uint32 instance, time_t t); - time_t GetGORespawnTime(uint32 loguid, uint32 instance) { return mGORespawnTimes[MAKE_PAIR64(loguid,instance)]; } + time_t GetGORespawnTime(uint32 loguid, uint32 instance) + { + ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, m_GORespawnTimesMtx, 0); + return mGORespawnTimes[MAKE_PAIR64(loguid,instance)]; } + } void SaveGORespawnTime(uint32 loguid, uint32 instance, time_t t); void DeleteRespawnTimeForInstance(uint32 instance); |