diff options
| author | Roc13x <roc13x@gmail.com> | 2018-04-22 19:04:02 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2018-04-22 20:04:02 +0200 |
| commit | 6b9948857057cfe495807a61b6797c75d9fc7a6a (patch) | |
| tree | cd1a825be5c9a1dd57944677d09eb80ea20b21ee /src/server/game/Guilds | |
| parent | 4feaf2463ddf87621a3571f90043d8e8c5c1a22b (diff) | |
Core/Guild: Implemented guild master dethrone (#21833)
Diffstat (limited to 'src/server/game/Guilds')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 59 | ||||
| -rw-r--r-- | src/server/game/Guilds/Guild.h | 4 |
2 files changed, 46 insertions, 17 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 93ad5574a13..ac4f7e6e62d 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -658,6 +658,13 @@ bool Guild::Member::CheckStats() const return true; } +float Guild::Member::GetInactiveDays() const +{ + if (IsOnline()) + return 0.0f; + return float(::time(nullptr) - GetLogoutTime()) / float(DAY); +} + // Decreases amount of slots left for today. void Guild::Member::UpdateBankTabWithdrawValue(SQLTransaction& trans, uint8 tabId, uint32 amount) { @@ -1321,7 +1328,7 @@ void Guild::HandleRoster(WorldSession* session) memberData.AreaID = int32(member->GetZoneId()); memberData.PersonalAchievementPoints = int32(member->GetAchievementPoints()); memberData.GuildReputation = int32(member->GetTotalReputation()); - memberData.LastSave = float(member->IsOnline() ? 0.0f : float(::time(nullptr) - member->GetLogoutTime()) / DAY); + memberData.LastSave = member->GetInactiveDays(); //GuildRosterProfessionData @@ -1504,28 +1511,48 @@ void Guild::HandleSetEmblem(WorldSession* session, const EmblemInfo& emblemInfo) } } -void Guild::HandleSetNewGuildMaster(WorldSession* session, std::string const& name) +void Guild::HandleSetNewGuildMaster(WorldSession* session, std::string const& name, bool isSelfPromote) { Player* player = session->GetPlayer(); - // Only the guild master can throne a new guild master - if (!_IsLeader(player)) - SendCommandResult(session, GUILD_COMMAND_CHANGE_LEADER, ERR_GUILD_PERMISSIONS); - // Old GM must be a guild member - else if (Member* oldGuildMaster = GetMember(player->GetGUID())) - { - // Same for the new one - if (Member* newGuildMaster = GetMember(name)) - { - SQLTransaction trans = CharacterDatabase.BeginTransaction(); - _SetLeader(trans, newGuildMaster); - oldGuildMaster->ChangeRank(trans, GR_INITIATE); + Member* oldGuildMaster = GetMember(GetLeaderGUID()); + ASSERT(oldGuildMaster); - SendEventNewLeader(newGuildMaster, oldGuildMaster); + Member* newGuildMaster; - CharacterDatabase.CommitTransaction(trans); + if (isSelfPromote) + { + newGuildMaster = GetMember(player->GetGUID()); + if (!newGuildMaster) + return; + + if (!newGuildMaster->IsRankNotLower(GR_MEMBER) || uint32(oldGuildMaster->GetInactiveDays()) < GUILD_MASTER_DETHRONE_INACTIVE_DAYS) + { + SendCommandResult(session, GUILD_COMMAND_CHANGE_LEADER, ERR_GUILD_PERMISSIONS); + return; } } + else + { + if (!_IsLeader(player)) + { + SendCommandResult(session, GUILD_COMMAND_CHANGE_LEADER, ERR_GUILD_PERMISSIONS); + return; + } + + newGuildMaster = GetMember(name); + if (!newGuildMaster) + return; + } + + SQLTransaction trans = CharacterDatabase.BeginTransaction(); + + _SetLeader(trans, newGuildMaster); + oldGuildMaster->ChangeRank(trans, GR_INITIATE); + + SendEventNewLeader(newGuildMaster, oldGuildMaster, isSelfPromote); + + CharacterDatabase.CommitTransaction(trans); } void Guild::HandleSetBankTabInfo(WorldSession* session, uint8 tabId, std::string const& name, std::string const& icon) diff --git a/src/server/game/Guilds/Guild.h b/src/server/game/Guilds/Guild.h index d8684ebd3ea..03781d37ab0 100644 --- a/src/server/game/Guilds/Guild.h +++ b/src/server/game/Guilds/Guild.h @@ -48,6 +48,7 @@ enum GuildMisc GUILD_BANK_MAX_TABS = 8, // send by client for money log also GUILD_BANK_MAX_SLOTS = 98, GUILD_BANK_MONEY_LOGS_TAB = 100, // used for money log in DB + GUILD_MASTER_DETHRONE_INACTIVE_DAYS = 90, GUILD_RANKS_MIN_COUNT = 2, GUILD_RANKS_MAX_COUNT = 10, GUILD_RANK_NONE = 0xFF, @@ -353,6 +354,7 @@ class TC_GAME_API Guild uint32 GetAccountId() const { return m_accountId; } uint8 GetRankId() const { return m_rankId; } uint64 GetLogoutTime() const { return m_logoutTime; } + float GetInactiveDays() const; std::string GetPublicNote() const { return m_publicNote; } std::string GetOfficerNote() const { return m_officerNote; } uint8 GetClass() const { return m_class; } @@ -758,7 +760,7 @@ class TC_GAME_API Guild void HandleSetMOTD(WorldSession* session, std::string const& motd); void HandleSetInfo(WorldSession* session, std::string const& info); void HandleSetEmblem(WorldSession* session, const EmblemInfo& emblemInfo); - void HandleSetNewGuildMaster(WorldSession* session, std::string const& name); + void HandleSetNewGuildMaster(WorldSession* session, std::string const& name, bool isSelfPromote); void HandleSetBankTabInfo(WorldSession* session, uint8 tabId, std::string const& name, std::string const& icon); void HandleSetMemberNote(WorldSession* session, std::string const& note, ObjectGuid guid, bool isPublic); void HandleSetRankInfo(WorldSession* session, uint8 rankId, std::string const& name, uint32 rights, uint32 moneyPerDay, GuildBankRightsAndSlotsVec const& rightsAndSlots); |
