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

[Bug Fix] Fix for transferring Raid Leader (#3140)

Browse Source
This commit is contained in:
Aeadoin 2023-03-23 19:04:59 -04:00 committed by GitHub
parent e085f271f5
commit c975dc2412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/client_packet.cpp
View File

@ -12177,12 +12177,10 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket* app)
//Added to remove all bots if the Bot_Owner is removed from the Raid //Added to remove all bots if the Bot_Owner is removed from the Raid
//Does not camp the Bots, just removes from the raid //Does not camp the Bots, just removes from the raid
if (c_to_disband) { if (c_to_disband) {
uint32 i = raid->GetPlayerIndex(raid_command_packet->leader_name);
raid->SetNewRaidLeader(i);
raid->HandleBotGroupDisband(c_to_disband->CharacterID()); raid->HandleBotGroupDisband(c_to_disband->CharacterID());
raid->RemoveMember(raid_command_packet->leader_name); raid->RemoveMember(raid_command_packet->leader_name);
if (raid->IsLeader(c_to_disband->GetName())) {
uint32 i = raid->GetPlayerIndex(raid_command_packet->leader_name);
raid->SetNewRaidLeader(i);
}
raid->SendGroupDisband(c_to_disband); raid->SendGroupDisband(c_to_disband);
raid->GroupUpdate(group); raid->GroupUpdate(group);
if (!raid->RaidCount()) { if (!raid->RaidCount()) {
@ -12213,8 +12211,8 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket* app)
break; break;
} }
} }
uint32 i = raid->GetPlayerIndex(raid_command_packet->leader_name);
if (group < 12) { if (group < 12) {
uint32 i = raid->GetPlayerIndex(raid_command_packet->leader_name);
if (raid->members[i].is_group_leader) { //assign group leader to someone else if (raid->members[i].is_group_leader) { //assign group leader to someone else
for (int x = 0; x < MAX_RAID_MEMBERS; x++) { for (int x = 0; x < MAX_RAID_MEMBERS; x++) {
if (strlen(raid->members[x].member_name) > 0 && i != x) { if (strlen(raid->members[x].member_name) > 0 && i != x) {
@ -12227,8 +12225,8 @@ void Client::Handle_OP_RaidCommand(const EQApplicationPacket* app)
} }
} }
} }
raid->SetNewRaidLeader(i);
} }
raid->SetNewRaidLeader(i);
raid->RemoveMember(raid_command_packet->leader_name); raid->RemoveMember(raid_command_packet->leader_name);
Client* c = entity_list.GetClientByName(raid_command_packet->leader_name); Client* c = entity_list.GetClientByName(raid_command_packet->leader_name);
if (c) { if (c) {

2
zone/raids.cpp
View File

@ -2158,7 +2158,7 @@ void Raid::SetNewRaidLeader(uint32 i)
continue; continue;
} }
if (m.member && strlen(m.member_name) > 0 && strcmp(m.member_name, m.member_name) != 0) { if (m.member && strlen(m.member_name) > 0 && strcmp(m.member_name, members[i].member_name) != 0) {
SetRaidLeader(members[i].member_name, m.member_name); SetRaidLeader(members[i].member_name, m.member_name);
UpdateRaidAAs(); UpdateRaidAAs();
SendAllRaidLeadershipAA(); SendAllRaidLeadershipAA();