diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2019-06-22 22:21:09 +0200 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2019-06-22 22:21:09 +0200 |
| commit | c06330acf2b307604c97bdd7ad5dfd34b97bbf23 (patch) | |
| tree | 184aebeb2e8cb5bc1a14cea2e4ab3d93c1749a51 /src/server/game/Groups/Group.cpp | |
| parent | eeced9ae158640de67ed0cb59d01ae92570bfa77 (diff) | |
Revert "Core/AI: Fix Guardians not following the owner after finishing combat (#23466)"
This reverts commit c234604e82f291752f9095babe60e1780fd07569.
Diffstat (limited to 'src/server/game/Groups/Group.cpp')
| -rw-r--r-- | src/server/game/Groups/Group.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Groups/Group.cpp b/src/server/game/Groups/Group.cpp index 05b0aab0164..b46fe069cfb 100644 --- a/src/server/game/Groups/Group.cpp +++ b/src/server/game/Groups/Group.cpp @@ -2173,7 +2173,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo) // do not reset the instance, just unbind if others are permanently bound to it if (isEmpty && instanceSave->CanReset()) { - if (map && isRaidGroup() && map->IsDungeon() && SendMsgTo) + if (map && this->isRaidGroup() && map->IsDungeon() && SendMsgTo) { AreaTrigger const * const instanceEntrance = sObjectMgr->GetGoBackTrigger(map->GetId()); @@ -2184,7 +2184,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo) WorldSafeLocsEntry const * graveyardLocation = sObjectMgr->GetClosestGraveyard(instanceEntrance->target_X, instanceEntrance->target_Y, instanceEntrance->target_Z, instanceEntrance->target_mapId, SendMsgTo->GetTeam());; uint32 const zoneId = sMapMgr->GetZoneId(graveyardLocation->map_id, graveyardLocation->x, graveyardLocation->y, graveyardLocation->z); - for (const MemberSlot &member : GetMemberSlots()) + for (const MemberSlot &member : this->GetMemberSlots()) { if (!ObjectAccessor::FindConnectedPlayer(member.guid)) { @@ -2196,7 +2196,7 @@ void Group::ResetInstances(uint8 method, bool isRaid, Player* SendMsgTo) stmt->setFloat(3, instanceEntrance->target_Orientation); stmt->setUInt32(4, graveyardLocation->map_id); stmt->setUInt32(5, zoneId); - stmt->setUInt32(6, member.guid.GetCounter()); + stmt->setUInt32(6, member.guid); stmt->setUInt32(7, map->GetId()); CharacterDatabase.Execute(stmt); |