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

2 files changed, 2 insertions, 2 deletions

diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 905d3dde573..c50f39d7452 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -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);
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index a88defad1ce..0508d95a60b 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -842,7 +842,7 @@ class spell_item_book_of_glyph_mastery : 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);
             }