@@ -4302,12 +4302,15 @@ SpellCastResult Spell::CheckCast(bool strict) } case SPELL_EFFECT_TAMECREATURE: { - if (m_caster->GetTypeId() != TYPEID_PLAYER || + // Spell can be triggered, we need to check original caster prior to caster + Unit* caster = m_originalCaster ? m_originalCaster : m_caster; + + if (caster->GetTypeId() != TYPEID_PLAYER || !m_targets.getUnitTarget() || m_targets.getUnitTarget()->GetTypeId() == TYPEID_PLAYER) return SPELL_FAILED_BAD_TARGETS; - Player* plrCaster = (Player*)m_caster; + Player* plrCaster = (Player*)caster; if(plrCaster->getClass() != CLASS_HUNTER) { src/game/Spell.cpp @@ -4242,7 +4242,8 @@ void Spell::EffectEnchantItemTmp(uint32 i) void Spell::EffectTameCreature(uint32 /*i*/) { // Caster must be player, checked in Spell::CheckCast - Player* plr = (Player*)m_caster; + // Spell can be triggered, we need to check original caster prior to caster + Player* plr = (Player*)(m_originalCaster ? m_originalCaster : m_caster); Creature* creatureTarget = (Creature*)unitTarget; src/game/SpellEffects.cpp @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8716" + #define REVISION_NR "8717" #endif // __REVISION_NR_H__ src/shared/revision_nr.h 63eb1e42da88a1c53c8de4ccf79a507b6dc20e6c ApoC apoc@nymfe.net http://github.com/apoc/mangos/commit/1099b43803e97cf41227b50980b7b08ff2a63abd 1099b43803e97cf41227b50980b7b08ff2a63abd 2009-10-24T08:44:50-07:00 2009-10-23T12:42:23-07:00 [8717] Fixed SPELL_EFFECT_TAMECREATURE broken after [8686] Signed-off-by: ApoC <apoc@nymfe.net> 7fd3c72c32ad393fbf99625a365c69611c957d0c ApoC apoc@nymfe.net