pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 16:41:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Bug Fix] Added additional Guild-related crash checks (#4105)

Browse Source
This commit is contained in:
Mitch Freeman 2024-02-21 20:44:05 -04:00 committed by GitHub
parent 67d8250b1c
commit a00b2eb382
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 48 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
world/wguild_mgr.cpp
View File

@ -369,6 +369,10 @@ bool WorldGuildManager::LoadTributes()
bool WorldGuildManager::RefreshGuild(uint32 guild_id) bool WorldGuildManager::RefreshGuild(uint32 guild_id)
{ {
auto temp_guild = GetGuildByGuildID(guild_id); auto temp_guild = GetGuildByGuildID(guild_id);
if (!temp_guild) {
return false;
}
BaseGuildManager::GuildInfo temp_guild_detail; BaseGuildManager::GuildInfo temp_guild_detail;
if (temp_guild) { if (temp_guild) {
@ -389,6 +393,11 @@ bool WorldGuildManager::RefreshGuild(uint32 guild_id)
LogGuilds("Found guild id [{}]. Loading details.....", db_guild.id); LogGuilds("Found guild id [{}]. Loading details.....", db_guild.id);
_CreateGuild(db_guild.id, db_guild.name, db_guild.leader, db_guild.minstatus, db_guild.motd, db_guild.motd_setter, db_guild.channel, db_guild.url, db_guild.favor); _CreateGuild(db_guild.id, db_guild.name, db_guild.leader, db_guild.minstatus, db_guild.motd, db_guild.motd_setter, db_guild.channel, db_guild.url, db_guild.favor);
auto guild = GetGuildByGuildID(guild_id); auto guild = GetGuildByGuildID(guild_id);
if (!guild) {
LogError("Error refreshing guild id {}", guild_id);
return false;
}
auto where_filter = fmt::format("guild_id = '{}'", guild_id); auto where_filter = fmt::format("guild_id = '{}'", guild_id);
auto guild_ranks = GuildRanksRepository::GetWhere(*m_db, where_filter); auto guild_ranks = GuildRanksRepository::GetWhere(*m_db, where_filter);
for (auto const& r : guild_ranks) { for (auto const& r : guild_ranks) {

71
zone/guild_mgr.cpp
View File

@ -514,14 +514,18 @@ void ZoneGuildManager::ProcessWorldPacket(ServerPacket *pack)
} }
case ServerOP_GuildPermissionUpdate: { case ServerOP_GuildPermissionUpdate: {
if (is_zone_loaded) { if (is_zone_loaded) {
auto *sgpus = (ServerGuildPermissionUpdate_Struct *) pack->pBuffer; auto *sgpus = (ServerGuildPermissionUpdate_Struct *)pack->pBuffer;
auto res = m_guilds.find(sgpus->guild_id); auto guild = GetGuildByGuildID(sgpus->guild_id);
if (sgpus->function_value) { if (!guild) {
res->second->functions[sgpus->function_id].perm_value |= (1UL << (8 - sgpus->rank)); return;
} }
else {
res->second->functions[sgpus->function_id].perm_value &= ~(1UL << (8 - sgpus->rank)); if (sgpus->function_value) {
} guild->functions[sgpus->function_id].perm_value |= (1UL << (8 - sgpus->rank));
}
else {
guild->functions[sgpus->function_id].perm_value &= ~(1UL << (8 - sgpus->rank));
}
auto outapp = new EQApplicationPacket(OP_GuildUpdate, sizeof(GuildPermission_Struct)); auto outapp = new EQApplicationPacket(OP_GuildUpdate, sizeof(GuildPermission_Struct));
auto *guuacs = (GuildPermission_Struct *) outapp->pBuffer; auto *guuacs = (GuildPermission_Struct *) outapp->pBuffer;
@ -1489,16 +1493,20 @@ bool GuildBankManager::AllowedToWithdraw(uint32 GuildID, uint16 Area, uint16 Slo
void ZoneGuildManager::UpdateRankPermission(uint32 gid, uint32 charid, uint32 fid, uint32 rank, uint32 value) void ZoneGuildManager::UpdateRankPermission(uint32 gid, uint32 charid, uint32 fid, uint32 rank, uint32 value)
{ {
auto res = m_guilds.find(gid); auto guild = GetGuildByGuildID(gid);
if (value) { if (!guild) {
res->second->functions[fid].perm_value |= (1UL << (8 - rank)); return;
} }
else {
res->second->functions[fid].perm_value &= ~(1UL << (8 - rank));
}
auto query = fmt::format("UPDATE guild_permissions SET permission = {} WHERE perm_id = {} AND guild_id = {};", res->second->functions[fid].perm_value, fid, gid);
auto results = m_db->QueryDatabase(query);
if (value) {
guild->functions[fid].perm_value |= (1UL << (8 - rank));
}
else {
guild->functions[fid].perm_value &= ~(1UL << (8 - rank));
}
auto query = fmt::format("UPDATE guild_permissions SET permission = {} WHERE perm_id = {} AND guild_id = {};",
guild->functions[fid].perm_value, fid, gid);
auto results = m_db->QueryDatabase(query);
} }
void ZoneGuildManager::SendPermissionUpdate(uint32 guild_id, uint32 rank, uint32 function_id, uint32 value) void ZoneGuildManager::SendPermissionUpdate(uint32 guild_id, uint32 rank, uint32 function_id, uint32 value)
@ -1534,21 +1542,20 @@ void ZoneGuildManager::SendRankName(uint32 guild_id, uint32 rank, std::string ra
void ZoneGuildManager::SendAllRankNames(uint32 guild_id, uint32 char_id) void ZoneGuildManager::SendAllRankNames(uint32 guild_id, uint32 char_id)
{ {
auto guild = m_guilds.find(guild_id); auto guild = GetGuildByGuildID(guild_id);
auto c = entity_list.GetClientByCharID(char_id); auto c = entity_list.GetClientByCharID(char_id);
if (c) if (guild && c) {
{ auto outapp = new EQApplicationPacket(OP_GuildUpdate, sizeof(GuildUpdateUCPStruct));
auto outapp = new EQApplicationPacket(OP_GuildUpdate, sizeof(GuildUpdateUCPStruct)); GuildUpdateUCPStruct *gucp = (GuildUpdateUCPStruct *)outapp->pBuffer;
GuildUpdateUCPStruct* gucp = (GuildUpdateUCPStruct*)outapp->pBuffer; for (int i = GUILD_LEADER; i <= GUILD_RECRUIT; i++) {
for (int i = GUILD_LEADER; i <= GUILD_RECRUIT; i++) gucp->payload.rank_name.rank = i;
{ strn0cpy(gucp->payload.rank_name.rank_name, guild->rank_names[i].c_str(),
gucp->payload.rank_name.rank = i; sizeof(gucp->payload.rank_name.rank_name));
strn0cpy(gucp->payload.rank_name.rank_name, guild->second->rank_names[i].c_str(), sizeof(gucp->payload.rank_name.rank_name)); gucp->action = GuildUpdateRanks;
gucp->action = GuildUpdateRanks; c->QueuePacket(outapp);
c->QueuePacket(outapp); }
} safe_delete(outapp);
safe_delete(outapp); }
}
} }
BaseGuildManager::GuildInfo* ZoneGuildManager::GetGuildByGuildID(uint32 guild_id) BaseGuildManager::GuildInfo* ZoneGuildManager::GetGuildByGuildID(uint32 guild_id)