diff options
| -rw-r--r-- | sql/characters.sql | 2 | ||||
| -rw-r--r-- | sql/updates/7314_01_characters_guild_rank.sql | 3 | ||||
| -rw-r--r-- | src/game/Guild.h | 4 | ||||
| -rw-r--r-- | src/game/GuildHandler.cpp | 2 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/sql/characters.sql b/sql/characters.sql index 4149459543a..b0fc4151d0b 100644 --- a/sql/characters.sql +++ b/sql/characters.sql @@ -21,7 +21,7 @@ DROP TABLE IF EXISTS `character_db_version`; CREATE TABLE `character_db_version` ( - `required_7307_01_characters_arena_team_member` bit(1) default NULL + `required_7314_01_characters_guild_rank` bit(1) default NULL ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Last applied sql update to DB'; -- diff --git a/sql/updates/7314_01_characters_guild_rank.sql b/sql/updates/7314_01_characters_guild_rank.sql new file mode 100644 index 00000000000..54cf219fc85 --- /dev/null +++ b/sql/updates/7314_01_characters_guild_rank.sql @@ -0,0 +1,3 @@ +ALTER TABLE character_db_version CHANGE COLUMN required_7307_01_characters_arena_team_member required_7314_01_characters_guild_rank bit; + +UPDATE guild_rank SET rights = rights & ~0x00020000;
\ No newline at end of file diff --git a/src/game/Guild.h b/src/game/Guild.h index 74e4bdf18ae..fb124bbc8e4 100644 --- a/src/game/Guild.h +++ b/src/game/Guild.h @@ -53,11 +53,11 @@ enum GuildRankRights GR_RIGHT_VIEWOFFNOTE = 0x00004040, GR_RIGHT_EOFFNOTE = 0x00008040, GR_RIGHT_MODIFY_GUILD_INFO = 0x00010040, - GR_RIGHT_REPAIR_FROM_GUILD = 0x00020000, // unused in 2.4.x?, Remove money withdraw capacity + GR_RIGHT_WITHDRAW_GOLD_LOCK = 0x00020000, // remove money withdraw capacity GR_RIGHT_WITHDRAW_REPAIR = 0x00040000, // withdraw for repair GR_RIGHT_WITHDRAW_GOLD = 0x00080000, // withdraw gold GR_RIGHT_CREATE_GUILD_EVENT = 0x00100000, // wotlk - GR_RIGHT_ALL = 0x001FF1FF + GR_RIGHT_ALL = 0x001DF1FF }; enum Typecommand diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp index 0889bf1a646..1a8e5e54f15 100644 --- a/src/game/GuildHandler.cpp +++ b/src/game/GuildHandler.cpp @@ -663,7 +663,7 @@ void WorldSession::HandleGuildRankOpcode(WorldPacket& recvPacket) guild->SetRankName(rankId, rankname); if(rankId==GR_GUILDMASTER) // prevent loss leader rights - rights |= GR_RIGHT_ALL; + rights = GR_RIGHT_ALL; guild->SetRankRights(rankId, rights); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 2c87187e709..4d9e7509fda 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7313" + #define REVISION_NR "7314" #endif // __REVISION_NR_H__ |