Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dbc' of https://github.com/Intel/TrinityCore into Intel-dbc

Browse Source 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/Events/GameEventMgr.cpp
This commit is contained in:
Rat
2014-11-10 15:18:01 +01:00
parent d268b81044 43d5fb5eae
commit ac0ff1fc9b
91 changed files with 2083 additions and 1848 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/game/Guilds/Guild.cpp
View File

@@ -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)