nchebrov/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots.git synced 2026-01-31 09:23:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Final

Browse Source
This commit is contained in:
SaW
2025-11-01 21:58:09 +01:00
committed by GitHub
parent f9fce01282
commit 4af85d3a14
1 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/PlayerbotAI.cpp
View File

@@ -2112,7 +2112,6 @@ bool PlayerbotAI::IsMainTank(Player* player)
} }
ObjectGuid mainTank = ObjectGuid(); ObjectGuid mainTank = ObjectGuid();
Group::MemberSlotList const& slots = group->GetMemberSlots();
for (Group::member_citerator itr = slots.begin(); itr != slots.end(); ++itr) for (Group::member_citerator itr = slots.begin(); itr != slots.end(); ++itr)
{ {
@@ -2228,20 +2227,17 @@ bool PlayerbotAI::IsHealAssistantOfIndex(Player* player, int index)
{ {
Group* group = player->GetGroup(); Group* group = player->GetGroup();
if (!group) if (!group)
{
return false; return false;
}
Group::MemberSlotList const& slots = group->GetMemberSlots();
int counter = 0; int counter = 0;
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next()) for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{ {
Player* member = ref->GetSource(); Player* member = ref->GetSource();
if (group->IsAssistant(member->GetGUID()) && IsHeal(member)) if (member && group->IsAssistant(member->GetGUID()) && IsHeal(member))
{ {
if (index == counter) if (index == counter)
{
return player == member; return player == member;
}
counter++; counter++;
} }
} }
@@ -2249,12 +2245,11 @@ bool PlayerbotAI::IsHealAssistantOfIndex(Player* player, int index)
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next()) for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{ {
Player* member = ref->GetSource(); Player* member = ref->GetSource();
if (!group->IsAssistant(member->GetGUID()) && IsHeal(member)) if (member && !group->IsAssistant(member->GetGUID()) && IsHeal(member))
{ {
if (index == counter) if (index == counter)
{
return player == member; return player == member;
}
counter++; counter++;
} }
} }
@@ -2267,20 +2262,17 @@ bool PlayerbotAI::IsRangedDpsAssistantOfIndex(Player* player, int index)
{ {
Group* group = player->GetGroup(); Group* group = player->GetGroup();
if (!group) if (!group)
{
return false; return false;
}
Group::MemberSlotList const& slots = group->GetMemberSlots();
int counter = 0; int counter = 0;
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next()) for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{ {
Player* member = ref->GetSource(); Player* member = ref->GetSource();
if (group->IsAssistant(member->GetGUID()) && IsRangedDps(member)) if (member && group->IsAssistant(member->GetGUID()) && IsRangedDps(member))
{ {
if (index == counter) if (index == counter)
{
return player == member; return player == member;
}
counter++; counter++;
} }
} }
@@ -2288,12 +2280,11 @@ bool PlayerbotAI::IsRangedDpsAssistantOfIndex(Player* player, int index)
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next()) for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{ {
Player* member = ref->GetSource(); Player* member = ref->GetSource();
if (!group->IsAssistant(member->GetGUID()) && IsRangedDps(member)) if (member && !group->IsAssistant(member->GetGUID()) && IsRangedDps(member))
{ {
if (index == counter) if (index == counter)
{
return player == member; return player == member;
}
counter++; counter++;
} }
} }
@@ -2306,20 +2297,17 @@ bool PlayerbotAI::IsAssistTankOfIndex(Player* player, int index)
{ {
Group* group = player->GetGroup(); Group* group = player->GetGroup();
if (!group) if (!group)
{
return false; return false;
}
Group::MemberSlotList const& slots = group->GetMemberSlots();
int counter = 0; int counter = 0;
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next()) for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{ {
Player* member = ref->GetSource(); Player* member = ref->GetSource();
if (group->IsAssistant(member->GetGUID()) && IsAssistTank(member)) if (member && group->IsAssistant(member->GetGUID()) && IsAssistTank(member))
{ {
if (index == counter) if (index == counter)
{
return player == member; return player == member;
}
counter++; counter++;
} }
} }
@@ -2327,12 +2315,11 @@ bool PlayerbotAI::IsAssistTankOfIndex(Player* player, int index)
for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next()) for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
{ {
Player* member = ref->GetSource(); Player* member = ref->GetSource();
if (!group->IsAssistant(member->GetGUID()) && IsAssistTank(member)) if (member && !group->IsAssistant(member->GetGUID()) && IsAssistTank(member))
{ {
if (index == counter) if (index == counter)
{
return player == member; return player == member;
}
counter++; counter++;
} }
} }