Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-06 00:48:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/SkillHandler.cpp
This commit is contained in:
Vincent-Michael
2014-07-12 18:08:30 +02:00
parent 3f0ce25d5d 6d8dbb5c4a
commit 0f5c481cd4
14 changed files with 217 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2324,7 +2324,7 @@ 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);
player->LearnSpell(entry->SpellId, true);
SendGuildReputationWeeklyCap(session, member->GetWeekReputation());
@@ -2772,7 +2772,7 @@ void Guild::DeleteMember(uint64 guid, bool isDisbanding, bool isKicked, bool can
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);
player->RemoveSpell(entry->SpellId, false, false);
}
_DeleteMemberFromDB(lowguid);
@@ -3540,7 +3540,7 @@ void Guild::GiveXP(uint32 xp, Player* source)
{
player->SetGuildLevel(GetLevel());
for (size_t i = 0; i < perksToLearn.size(); ++i)
player->learnSpell(perksToLearn[i], true);
player->LearnSpell(perksToLearn[i], true);
}
}