Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/AI/SmartScripts/SmartScriptMgr.cpp src/server/game/Battlegrounds/BattlegroundMgr.cpp src/server/game/Guilds/Guild.h src/server/game/Spells/SpellMgr.cpp src/tools/map_extractor/loadlib.cpp
This commit is contained in:
commit
d25c2e7f5b
43 files changed
+318
-165
No files matched your search
@@ -1679,7 +1679,7 @@ void Guild::HandleSetMemberNote(WorldSession* session, std::string const& note,
|
||||
}
|
||||
}
|
||||
|
||||
void Guild::HandleSetRankInfo(WorldSession* session, uint8 rankId, std::string const& name, uint32 rights, uint32 moneyPerDay, GuildBankRightsAndSlotsVec rightsAndSlots)
|
||||
void Guild::HandleSetRankInfo(WorldSession* session, uint8 rankId, std::string const& name, uint32 rights, uint32 moneyPerDay, const GuildBankRightsAndSlotsVec& rightsAndSlots)
|
||||
{
|
||||
// Only leader can modify ranks
|
||||
if (!_IsLeader(session->GetPlayer()))
|
||||
|
||||
Reference in new issue
Block a user