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

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
14 changed files with 217 additions and 186 deletions
+1 -1
View File
@@ -2745,7 +2745,7 @@ class spell_gen_profession_research : public SpellScriptLoader
// learn random explicit discovery recipe (if any)
if (uint32 discoveredSpellId = GetExplicitDiscoverySpell(spellId, caster))
caster->learnSpell(discoveredSpellId, false);
caster->LearnSpell(discoveredSpellId, false);
caster->UpdateCraftSkill(spellId);
}