From 5aeda4f28b61d3ef5840a1262e59feee0f6c5650 Mon Sep 17 00:00:00 2001
From: VladimirMangos <vladimir@getmangos.com>
Date: Sun, 6 Mar 2011 12:48:08 +0300
Subject: [PATCH] [11223] Replace direct auras adding from creature*_addon
 tables by cast spell.

---
 src/game/Creature.cpp    | 19 +------------------
 src/game/ObjectMgr.cpp   |  6 ------
 src/shared/revision_nr.h |  2 +-
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 717d64533..a894ba21b 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -1908,7 +1908,6 @@ bool Creature::LoadCreatureAddon(bool reload)
                 continue;
             }
 
-            // skip already applied aura
             if (HasAura(cAura->spell_id))
             {
                 if(!reload)
@@ -1917,23 +1916,7 @@ bool Creature::LoadCreatureAddon(bool reload)
                 continue;
             }
 
-            SpellAuraHolder *holder = CreateSpellAuraHolder(AdditionalSpellInfo, this, this);
-
-            for(uint32 eff = 0; eff < MAX_EFFECT_INDEX; ++eff)
-            {
-                if (IsSpellAppliesAura(AdditionalSpellInfo, 1 << eff))
-                {
-                    Aura* AdditionalAura = CreateAura(AdditionalSpellInfo, SpellEffectIndex(eff), NULL, holder, this, this);
-                    holder->AddAura(AdditionalAura, SpellEffectIndex(eff));
-
-                    DEBUG_FILTER_LOG(LOG_FILTER_SPELL_CAST, "Spell: %u - Aura %u added to creature (GUIDLow: %u Entry: %u)", cAura->spell_id, AdditionalSpellInfo->EffectApplyAuraName[eff], GetGUIDLow(), GetEntry());
-                }
-            }
-
-            if (!holder->IsEmptyHolder())
-                AddSpellAuraHolder(holder);
-            else
-                delete holder;
+            CastSpell(this, AdditionalSpellInfo, true);
         }
     }
     return true;
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 2cb66d746..81539ae77 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -798,12 +798,6 @@ void ObjectMgr::ConvertCreatureAddonAuras(CreatureDataAddon* addon, char const*
             continue;
         }
 
-        if (!IsSpellAppliesAura(AdditionalSpellInfo))
-        {
-            sLog.outErrorDb("Creature (%s: %u) has spell %u defined in `auras` field in `%s` but spell doesn't apply any auras.", guidEntryStr, addon->guidOrEntry, cAura.spell_id, table);
-            continue;
-        }
-
         ++i;
     }
 
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 26de8f874..cf4e2cbc2 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11222"
+ #define REVISION_NR "11223"
 #endif // __REVISION_NR_H__