*Merge.

--HG-- branch : trunk
2009-03-17 00:28:59 +01:00
parent 0cb08705b9 d41910ec29
commit b1da219266
1 changed files with 4 additions and 3 deletions
@@ -1884,11 +1884,12 @@ void Aura::TriggerSpell()
        }
    }

+    if(triggeredSpellInfo)
+    {
        if(!caster->GetSpellMaxRangeForTarget(m_target,sSpellRangeStore.LookupEntry(triggeredSpellInfo->rangeIndex)))
            target = m_target;    //for druid dispel poison
-
-    if(triggeredSpellInfo)
        m_target->CastSpell(target, triggeredSpellInfo, true, 0, this, GetCasterGUID());
+    }
    else if(target->GetTypeId()!=TYPEID_UNIT || !Script->EffectDummyCreature(caster, GetId(), GetEffIndex(), (Creature*)target))
        sLog.outError("Aura::TriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?",GetId(),GetEffIndex());
 }