From ec26281ad50b91ada78e443f7ee2e38c346258c9 Mon Sep 17 00:00:00 2001 From: neckkola <65987027+neckkola@users.noreply.github.com> Date: Thu, 6 Jan 2022 19:54:06 -0400 Subject: [PATCH] Updated Raid::VerifyRaid --- zone/bot.cpp | 5 +++-- zone/raids.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zone/bot.cpp b/zone/bot.cpp index 7fff6c472..a2ccbe234 100644 --- a/zone/bot.cpp +++ b/zone/bot.cpp @@ -10108,13 +10108,13 @@ void Bot::ProcessRaidInvite(Bot* player_accepting_invite, Client* b_owner) { Group* group = player_accepting_invite->GetGroup(); if (group) { if (group->GroupCount() + raid->RaidCount() > MAX_RAID_MEMBERS) { - b_owner->Message(Chat::Red, "Invite failed, group invite would create a raid larger than the maximum number of members allowed."); + b_owner->Message(Chat::Red, "Invite failed, bot group invite would create a raid larger than the maximum number of members allowed."); return; } } else { if (1 + raid->RaidCount() > MAX_RAID_MEMBERS) { - b_owner->Message(Chat::Red, "Invite failed, member invite would create a raid larger than the maximum number of members allowed."); + b_owner->Message(Chat::Red, "Invite failed, bot invite would create a raid larger than the maximum number of members allowed."); return; } } @@ -10122,6 +10122,7 @@ void Bot::ProcessRaidInvite(Bot* player_accepting_invite, Client* b_owner) { uint32 free_group_id = raid->GetFreeGroup(); Client* addClient = nullptr; Bot* addBot = nullptr; + for (int x = 0; x < 6; x++) { if (group->members[x]) { Client* c = nullptr; diff --git a/zone/raids.cpp b/zone/raids.cpp index ce077e43e..3b589b8a8 100644 --- a/zone/raids.cpp +++ b/zone/raids.cpp @@ -1633,7 +1633,7 @@ void Raid::VerifyRaid() members[x].member = nullptr; } } - if(members[x].IsRaidLeader && !members[x].member->IsBot()){ //Mitch added reference to IsBot + if(members[x].IsRaidLeader){ if(strlen(members[x].membername) > 0){ SetLeader(members[x].member); strn0cpy(leadername, members[x].membername, 64);