Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DB: Fix spellscript validation startup errors

Browse Source 
Closes #44
This commit is contained in:
ariel-
2016-01-19 01:42:42 -03:00
parent 39fb6f1d6d
commit 2961a6baaf
3 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/server/scripts/Spells/spell_dk.cpp
View File

@@ -390,6 +390,13 @@ class spell_dk_death_and_decay : public SpellScriptLoader
{
PrepareAuraScript(spell_dk_death_and_decay_AuraScript);
bool Validate(SpellInfo const* /*spellInfo*/) override
{
if (!sSpellMgr->GetSpellInfo(SPELL_DK_DEATH_AND_DECAY_DAMAGE))
return false;
return true;
}
void HandleDummyTick(AuraEffect const* aurEff)
{
if (Unit* caster = GetCaster())
@@ -398,7 +405,7 @@ class spell_dk_death_and_decay : public SpellScriptLoader
void Register() override
{
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dk_death_and_decay_AuraScript::HandleDummyTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
OnEffectPeriodic += AuraEffectPeriodicFn(spell_dk_death_and_decay_AuraScript::HandleDummyTick, EFFECT_1, SPELL_AURA_PERIODIC_DUMMY);
}
};

21
src/server/scripts/Spells/spell_generic.cpp
View File

@@ -811,6 +811,7 @@ class spell_gen_chaos_blast : public SpellScriptLoader
enum Clone
{
SPELL_CLONE_ME = 45204,
SPELL_NIGHTMARE_FIGMENT_MIRROR_IMAGE = 57528
};
@@ -831,15 +832,19 @@ class spell_gen_clone : public SpellScriptLoader
void Register() override
{
if (m_scriptSpellId == SPELL_NIGHTMARE_FIGMENT_MIRROR_IMAGE)
switch (m_scriptSpellId)
{
OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_DUMMY);
}
else
{
OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
case SPELL_CLONE_ME:
OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
break;
case SPELL_NIGHTMARE_FIGMENT_MIRROR_IMAGE:
OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_DUMMY);
OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_DUMMY);
break;
default:
OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_1, SPELL_EFFECT_SCRIPT_EFFECT);
OnEffectHitTarget += SpellEffectFn(spell_gen_clone_SpellScript::HandleScriptEffect, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
break;
}
}
};