Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2023-12-12 20:52:42 +08:00
1088 changed files with 35633 additions and 19812 deletions

View File

@@ -19,6 +19,7 @@
#define AZEROTHCORE_GROUP_H
#include "DBCEnums.h"
#include "DataMap.h"
#include "GroupRefMgr.h"
#include "LootMgr.h"
#include "QueryResult.h"
@@ -44,7 +45,7 @@ struct MapEntry;
#define MAX_RAID_SUBGROUPS MAXRAIDSIZE/MAXGROUPSIZE
#define TARGETICONCOUNT 8
enum RollVote : uint32
enum RollVote : uint8
{
PASS = 0,
NEED = 1,
@@ -242,6 +243,7 @@ public:
GroupReference* GetFirstMember() { return m_memberMgr.getFirst(); }
GroupReference const* GetFirstMember() const { return m_memberMgr.getFirst(); }
uint32 GetMembersCount() const { return m_memberSlots.size(); }
uint32 GetInviteeCount() const { return m_invitees.size(); }
uint8 GetMemberGroup(ObjectGuid guid) const;
@@ -322,6 +324,8 @@ public:
void SetDifficultyChangePrevention(DifficultyPreventionChangeType type);
void DoForAllMembers(std::function<void(Player*)> const& worker);
DataMap CustomData;
protected:
void _homebindIfInstance(Player* player);
void _cancelHomebindIfInstance(Player* player);