aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorxinef1 <w.szyszko2@gmail.com>2017-03-02 02:23:18 +0100
committerShauren <shauren.trinity@gmail.com>2019-08-17 20:04:14 +0200
commit73ee82e92cd5b52e2784f0354cce6e53cbe3f43e (patch)
treec1c48062e5930d255e0067dda756a94d7ae9f383 /src
parentd131bd1da0bf1b835ef912713dd7444361aa0089 (diff)
Make ObjectMgrs _mailId and _hiPetNumber atomic (#19129)
- They can be accessed from multiple threads simultaneously (cherrypicked from 3fe03392d792b4f7ddcc2326f215d9f459bef991)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp1
-rw-r--r--src/server/game/Globals/ObjectMgr.h5
2 files changed, 2 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 320d9d70f9e..f17e852fa9e 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -255,7 +255,6 @@ bool SpellClickInfo::IsFitToRequirements(Unit const* clicker, Unit const* clicke
ObjectMgr::ObjectMgr():
_auctionId(1),
_equipmentSetGuid(1),
- _itemTextId(1),
_mailId(1),
_hiPetNumber(1),
_voidItemId(1),
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h
index 229f92497eb..374b13ef836 100644
--- a/src/server/game/Globals/ObjectMgr.h
+++ b/src/server/game/Globals/ObjectMgr.h
@@ -1602,9 +1602,8 @@ class TC_GAME_API ObjectMgr
// first free id for selected id type
uint32 _auctionId;
uint64 _equipmentSetGuid;
- uint32 _itemTextId;
- uint32 _mailId;
- uint32 _hiPetNumber;
+ std::atomic<uint32> _mailId;
+ std::atomic<uint32> _hiPetNumber;
uint64 _voidItemId;
uint64 _creatureSpawnId;
uint64 _gameObjectSpawnId;