From 9bd4507f920a1d6c4790107a34dcd8b983a934c0 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Fri, 26 Dec 2008 16:50:35 -0600
Subject: [PATCH] *Fix the bug that proc debuff applied on caster.

--HG--
branch : trunk
---
 src/game/SpellAuras.cpp | 4 ++++
 src/game/Unit.cpp       | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 449867c002..bf295d0322 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1140,6 +1140,10 @@ void Aura::TriggerSpell()
     uint64 originalCasterGUID = GetCasterGUID();
 
     SpellEntry const *triggeredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id);
+    SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(triggeredSpellInfo->rangeIndex);
+    if(!GetSpellMaxRange(srange))
+        target = caster;    //for druid dispel poison
+
     SpellEntry const *auraSpellInfo = GetSpellProto();
     uint32 auraId = auraSpellInfo->Id;
 
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 010c5a4d8c..8e81c11582 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -899,13 +899,13 @@ void Unit::CastSpell(Unit* Victim,SpellEntry const *spellInfo, bool triggered, I
     {
         if(spellmgr.SpellTargetType[spellInfo->EffectImplicitTargetA[i]] == TARGET_TYPE_UNIT_TARGET)
         {
-            SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->rangeIndex);
+            /*SpellRangeEntry const* srange = sSpellRangeStore.LookupEntry(spellInfo->rangeIndex);
             if(srange && GetSpellMaxRange(srange) == 0.0f)
             {
                 Victim = this;
                 break;
             }
-            else if(!Victim)
+            else */if(!Victim)
             {
                 sLog.outError("CastSpell: spell id %i by caster: %s %u) does not have unit target", spellInfo->Id,(GetTypeId()==TYPEID_PLAYER ? "player (GUID:" : "creature (Entry:"),(GetTypeId()==TYPEID_PLAYER ? GetGUIDLow() : GetEntry()));
                 return;
@@ -7693,8 +7693,8 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, Aura* triggeredB
 
     if(basepoints0)
         CastCustomSpell(target,trigger_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura);
-    else if(spellmgr.GetSpellCustomAttr(trigger_spell_id) & SPELL_ATTR_CU_AURA_SPELL)
-        AddAura(trigger_spell_id, target);
+    //else if(spellmgr.GetSpellCustomAttr(trigger_spell_id) & SPELL_ATTR_CU_AURA_SPELL)
+    //    AddAura(trigger_spell_id, target);
     else
         CastSpell(target,trigger_spell_id,true,castItem,triggeredByAura);