Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
This commit is contained in:
Nay committed 2012-09-07 03:36:47 +01:00
commit 19b400761d
17 files changed
+142 -30

No files matched your search

+1 -1
View File
@@ -913,7 +913,7 @@ class spell_gen_profession_research : public SpellScriptLoader
uint32 spellId = GetSpellInfo()->Id;
// learn random explicit discovery recipe (if any)
if (uint32 discoveredSpellId = GetExplicitDiscoverySpell(spellId, caster->ToPlayer()))
if (uint32 discoveredSpellId = GetExplicitDiscoverySpell(spellId, caster))
caster->learnSpell(discoveredSpellId, false);
caster->UpdateCraftSkill(spellId);