diff options
| author | Rat <gmstreetrat@gmail.com> | 2014-11-10 15:18:42 +0100 |
|---|---|---|
| committer | Rat <gmstreetrat@gmail.com> | 2014-11-10 15:18:42 +0100 |
| commit | ef9bc5b17b3ad4f3bdfbd67c937b90d8d1dcd3eb (patch) | |
| tree | 9e939bb2b427ba8ae3e4c5512a6fc9975469c31f /src/server/game/Guilds/Guild.cpp | |
| parent | d268b81044707e15266eadb4ab49f176135d4c26 (diff) | |
| parent | ac0ff1fc9b4c409089bbcb0256bdbc2f5cc4a405 (diff) | |
Merge branch 'Intel-dbc' into 6.x
Diffstat (limited to 'src/server/game/Guilds/Guild.cpp')
| -rw-r--r-- | src/server/game/Guilds/Guild.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index a7fd0ca34ef..7b71c6e826a 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -2349,8 +2349,8 @@ void Guild::SendLoginInfo(WorldSession* session) for (uint32 i = 0; i < sGuildPerkSpellsStore.GetNumRows(); ++i) if (GuildPerkSpellsEntry const* entry = sGuildPerkSpellsStore.LookupEntry(i)) - if (entry->Level <= GetLevel()) - player->LearnSpell(entry->SpellId, true); + if (entry->GuildLevel <= GetLevel()) + player->LearnSpell(entry->SpellID, true); SendGuildReputationWeeklyCap(session, member->GetWeekReputation()); @@ -2805,8 +2805,8 @@ void Guild::DeleteMember(ObjectGuid guid, bool isDisbanding, bool isKicked, bool for (uint32 i = 0; i < sGuildPerkSpellsStore.GetNumRows(); ++i) if (GuildPerkSpellsEntry const* entry = sGuildPerkSpellsStore.LookupEntry(i)) - if (entry->Level <= GetLevel()) - player->RemoveSpell(entry->SpellId, false, false); + if (entry->GuildLevel <= GetLevel()) + player->RemoveSpell(entry->SpellID, false, false); } _DeleteMemberFromDB(guid.GetCounter()); @@ -3561,8 +3561,8 @@ void Guild::GiveXP(uint32 xp, Player* source) std::vector<uint32> perksToLearn; for (uint32 i = 0; i < sGuildPerkSpellsStore.GetNumRows(); ++i) if (GuildPerkSpellsEntry const* entry = sGuildPerkSpellsStore.LookupEntry(i)) - if (entry->Level > oldLevel && entry->Level <= GetLevel()) - perksToLearn.push_back(entry->SpellId); + if (entry->GuildLevel > oldLevel && entry->GuildLevel <= GetLevel()) + perksToLearn.push_back(entry->SpellID); // Notify all online players that guild level changed and learn perks for (Members::const_iterator itr = m_members.begin(); itr != m_members.end(); ++itr) |
