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

Verify new expedition leader in world

Browse Source 
Cleanup makeleader methods

World now checks if character is expedition member instead of zone
This commit is contained in:
hg
2020-11-02 23:41:21 -05:00
parent 311042f06d
commit 1de590137f
7 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
world/expedition.cpp
+13 -1
View File
@@ -55,6 +55,12 @@ void Expedition::AddMember(uint32_t character_id)
}
}
bool Expedition::HasMember(uint32_t character_id)
{
return std::any_of(m_member_ids.begin(), m_member_ids.end(),
[&](uint32_t member_id) { return member_id == character_id; });
}
void Expedition::RemoveMember(uint32_t character_id)
{
m_member_ids.erase(std::remove_if(m_member_ids.begin(), m_member_ids.end(),
@@ -89,12 +95,18 @@ void Expedition::ChooseNewLeader()
}
}
void Expedition::SetNewLeader(uint32_t character_id)
bool Expedition::SetNewLeader(uint32_t character_id)
{
if (!HasMember(character_id))
{
return false;
}
LogExpeditionsModerate("Replacing [{}] leader [{}] with [{}]", m_expedition_id, m_leader_id, character_id);
ExpeditionDatabase::UpdateLeaderID(m_expedition_id, character_id);
m_leader_id = character_id;
SendZonesLeaderChanged();
return true;
}
void Expedition::SendZonesExpeditionDeleted()