nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-17 17:24:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(Core/Misc): implement ObjectGuid class (port from TC) (#4885)

Browse Source
This commit is contained in:
UltraNix
2021-04-25 22:18:03 +02:00
committed by GitHub
parent 91081f4ad8
commit f4c226423d
568 changed files with 10655 additions and 11019 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/server/scripts/EasternKingdoms/Stratholme/instance_stratholme.cpp
View File

@@ -60,15 +60,6 @@ public:
_slaughterNPCs = 0;
_postboxesOpened = 0;
_zigguratDoorsGUID1 = 0;
_zigguratDoorsGUID2 = 0;
_zigguratDoorsGUID3 = 0;
_zigguratDoorsGUID4 = 0;
_zigguratDoorsGUID5 = 0;
_gauntletGateGUID = 0;
_slaughterGateGUID = 0;
_baronRivendareGUID = 0;
_gateTrapsCooldown[0] = false;
_gateTrapsCooldown[1] = false;
@@ -546,18 +537,18 @@ public:
uint32 _postboxesOpened;
EventMap events;
uint64 _zigguratDoorsGUID1;
uint64 _zigguratDoorsGUID2;
uint64 _zigguratDoorsGUID3;
uint64 _zigguratDoorsGUID4;
uint64 _zigguratDoorsGUID5;
uint64 _slaughterGateGUID;
uint64 _gauntletGateGUID;
uint64 _baronRivendareGUID;
ObjectGuid _zigguratDoorsGUID1;
ObjectGuid _zigguratDoorsGUID2;
ObjectGuid _zigguratDoorsGUID3;
ObjectGuid _zigguratDoorsGUID4;
ObjectGuid _zigguratDoorsGUID5;
ObjectGuid _slaughterGateGUID;
ObjectGuid _gauntletGateGUID;
ObjectGuid _baronRivendareGUID;
bool _gateTrapsCooldown[2];
uint64 _trappedPlayerGUID;
uint64 _trapGatesGUIDs[4];
ObjectGuid _trappedPlayerGUID;
ObjectGuid _trapGatesGUIDs[4];
void gate_delay(int gate)
{
@@ -575,7 +566,7 @@ public:
{
if (_trappedPlayerGUID)
{
if (Player* pPlayer = instance->GetPlayer(_trappedPlayerGUID))
if (Player* pPlayer = ObjectAccessor::GetPlayer(instance, _trappedPlayerGUID))
{
DoSpawnPlaguedCritters(gate, pPlayer);
}