mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-15 01:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8455] Do not disband guild, if guild ranks are not defined for that guild, removed obsolete comment.

Browse source 
Do not allow to delete guild rank, when there are only 5 or less ranks defined.

Signed-off-by: Triply <triply@getmangos.com>
This commit is contained in:
Triply 2009-09-02 20:53:20 +02:00
parent ab9b738e54
commit 664112a738
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/game/Guild.cpp
View file

@ -297,7 +297,11 @@ bool Guild::LoadRanksFromDB(uint32 GuildId)
QueryResult *result = CharacterDatabase.PQuery("SELECT rid,rname,rights,BankMoneyPerDay FROM guild_rank WHERE guildid = '%u' ORDER BY rid ASC", GuildId);
if(!result)
return false;
{
sLog.outError("Guild %u has broken `guild_rank` data, creating new...",GuildId);
CreateDefaultGuildRanks(0);
return true;
}
bool broken_ranks = false;
@ -341,7 +345,6 @@ bool Guild::LoadRanksFromDB(uint32 GuildId)
CharacterDatabase.PExecute("DELETE FROM guild_rank WHERE guildid='%u'", GuildId);
for(size_t i = 0; i < m_Ranks.size(); ++i)
{
// guild_rank.rid always store rank+1
std::string name = m_Ranks[i].name;
uint32 rights = m_Ranks[i].rights;
CharacterDatabase.escape_string(name);
@ -641,7 +644,8 @@ void Guild::AddRank(const std::string& name_,uint32 rights, uint32 money)
void Guild::DelRank()
{
if(m_Ranks.empty())
// client won't allow to have less than GUILD_RANKS_MIN_COUNT ranks in guild
if(m_Ranks.size() <= GUILD_RANKS_MIN_COUNT)
return;
// delete lowest guild_rank