*Merge.

--HG--
branch : trunk

4 files changed, 28 insertions, 5 deletions

diff --git a/src/bindings/scripts/ScriptMgr.cpp b/src/bindings/scripts/ScriptMgr.cpp
index 2819405f733..a5ac7075e31 100644
--- a/src/bindings/scripts/ScriptMgr.cpp
+++ b/src/bindings/scripts/ScriptMgr.cpp
@@ -64,6 +64,8 @@ uint32 EAI_ErrorLevel;
 //*** End EventAI data ***
 
 void FillSpellSummary();
+void LoadOverridenSQLData();
+void LoadOverridenDBCData();
 
 // -- Scripts to be added --
 
@@ -1822,6 +1824,11 @@ void ScriptsInit()
     // -------------------
 
 	outstring_log(">> Loaded %i C++ Scripts.", num_sc_scripts);
+
+    outstring_log(">> Load Overriden SQL Data.");
+    LoadOverridenSQLData();
+    outstring_log(">> Load Overriden DBC Data.");
+    LoadOverridenDBCData();
 }
 
 //*********************************
diff --git a/src/bindings/scripts/include/sc_creature.cpp b/src/bindings/scripts/include/sc_creature.cpp
index 346e381e4d7..48a3a1abbc7 100644
--- a/src/bindings/scripts/include/sc_creature.cpp
+++ b/src/bindings/scripts/include/sc_creature.cpp
@@ -8,6 +8,7 @@
 #include "precompiled.h"
 #include "Item.h"
 #include "Spell.h"
+#include "ObjectMgr.h"
 
 // Spell summary for ScriptedAI::SelectSpell
 struct TSpellSummary {
@@ -828,3 +829,23 @@ void Scripted_NoMovementAI::AttackStart(Unit* who)
         DoStartNoMovement(who);
     }
 }
+
+void LoadOverridenSQLData()
+{
+    GameObjectInfo *goInfo;
+
+    // Sunwell Plateau : Kalecgos : Spectral Rift
+    goInfo = const_cast<GameObjectInfo*>(GetGameObjectInfo(187055));
+    if(goInfo && goInfo->type == GAMEOBJECT_TYPE_GOOBER)
+        goInfo->goober.lockId = 1714; // need LOCKTYPE_QUICK_OPEN
+}
+
+void LoadOverridenDBCData()
+{
+    SpellEntry *spellInfo;
+
+    // Black Temple : Illidan : Parasitic Shadowfiend Passive
+    spellInfo = const_cast<SpellEntry*>(GetSpellStore()->LookupEntry(41913));
+    if(spellInfo)
+        spellInfo->EffectApplyAuraName[0] = 4; // proc debuff, and summon infinite fiends
+}
diff --git a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
index bb7c59e2d0e..5b764367d06 100644
--- a/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
+++ b/src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp
@@ -368,10 +368,6 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
         pInstance = ((ScriptedInstance*)c->GetInstanceData());
         m_creature->CastSpell(m_creature, SPELL_DUAL_WIELD, true);
         Reset();
-
-        SpellEntry *TempSpell = (SpellEntry*)GetSpellStore()->LookupEntry(SPELL_SHADOWFIEND_PASSIVE);
-        if(TempSpell)
-            TempSpell->EffectApplyAuraName[0] = 4; // proc debuff, and summon infinite fiends
     }
 
     ScriptedInstance* pInstance;
diff --git a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp
index 2141d8dcb2e..edcf0c09c13 100644
--- a/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp
+++ b/src/bindings/scripts/scripts/zone/magisters_terrace/boss_felblood_kaelthas.cpp
@@ -24,7 +24,6 @@ EndScriptData */
 #include "precompiled.h"
 #include "def_magisters_terrace.h"
 #include "WorldPacket.h"
-#include "ObjectMgr.h"
 
 #define SAY_AGGRO                   -1585023                //This yell should be done when the room is cleared. For now, set it as aggro yell.
 #define SAY_PHOENIX                 -1585024