pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-31 00:46:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated Raid::VerifyRaid

Browse Source
This commit is contained in:
neckkola
2022-01-06 19:54:06 -04:00
parent fdb23f1a5f
commit ec26281ad5
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zone/bot.cpp
+3 -2
View File
@@ -10108,13 +10108,13 @@ void Bot::ProcessRaidInvite(Bot* player_accepting_invite, Client* b_owner) {
Group* group = player_accepting_invite->GetGroup(); Group* group = player_accepting_invite->GetGroup();
if (group) { if (group) {
if (group->GroupCount() + raid->RaidCount() > MAX_RAID_MEMBERS) { 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; return;
} }
} }
else { else {
if (1 + raid->RaidCount() > MAX_RAID_MEMBERS) { 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; return;
} }
} }
@@ -10122,6 +10122,7 @@ void Bot::ProcessRaidInvite(Bot* player_accepting_invite, Client* b_owner) {
uint32 free_group_id = raid->GetFreeGroup(); uint32 free_group_id = raid->GetFreeGroup();
Client* addClient = nullptr; Client* addClient = nullptr;
Bot* addBot = nullptr; Bot* addBot = nullptr;
for (int x = 0; x < 6; x++) { for (int x = 0; x < 6; x++) {
if (group->members[x]) { if (group->members[x]) {
Client* c = nullptr; Client* c = nullptr;
zone/raids.cpp
+1 -1
View File
@@ -1633,7 +1633,7 @@ void Raid::VerifyRaid()
members[x].member = nullptr; 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){ if(strlen(members[x].membername) > 0){
SetLeader(members[x].member); SetLeader(members[x].member);
strn0cpy(leadername, members[x].membername, 64); strn0cpy(leadername, members[x].membername, 64);