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

Core/Spells: fix runtime error

Browse Source 
Partial revert of 11650e4008
This commit is contained in:
ariel-
2016-10-10 16:31:47 -03:00
parent d429273410
commit a129b41f3d
3 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/updates/world/3.3.5/2016_10_10_04_world_335.sql Normal file
View File

@@ -0,0 +1 @@
DELETE FROM `spell_script_names` WHERE `ScriptName`='spell_hun_lock_and_load_dummy';

6
src/server/game/Spells/SpellMgr.cpp
View File

@@ -3004,6 +3004,12 @@ void SpellMgr::LoadSpellInfoCorrections()
case 53385: // Divine Storm (Damage)
spellInfo->MaxAffectedTargets = 4;
break;
case 56342: // Lock and Load (Rank 1)
// @workaround: Delete dummy effect from rank 1,
// effect apply aura has TargetA == TargetB == 0 but core still applies it to caster
// core bug?
spellInfo->Effects[EFFECT_2].Effect = 0;
break;
case 53480: // Roar of Sacrifice
// missing spell effect 2 data, taken from 4.3.4
spellInfo->Effects[EFFECT_1].Effect = SPELL_EFFECT_APPLY_AURA;

30
src/server/scripts/Spells/spell_hunter.cpp
View File

@@ -664,35 +664,6 @@ class spell_hun_lock_and_load : public SpellScriptLoader
}
};
// 56342 - Lock and Load (Rank 1)
class spell_hun_lock_and_load_dummy : public SpellScriptLoader
{
public:
spell_hun_lock_and_load_dummy() : SpellScriptLoader("spell_hun_lock_and_load_dummy") { }
class spell_hun_lock_and_load_dummy_AuraScript : public AuraScript
{
PrepareAuraScript(spell_hun_lock_and_load_dummy_AuraScript);
bool DummyCheck(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
{
// Prevents Aura proc from this dummy effect
// Only rank 1 has this aura
return false;
}
void Register() override
{
DoCheckEffectProc += AuraCheckEffectProcFn(spell_hun_lock_and_load_dummy_AuraScript::DummyCheck, EFFECT_2, SPELL_AURA_DUMMY);
}
};
AuraScript* GetAuraScript() const override
{
return new spell_hun_lock_and_load_dummy_AuraScript();
}
};
// 53271 - Masters Call
class spell_hun_masters_call : public SpellScriptLoader
{
@@ -1514,7 +1485,6 @@ void AddSC_hunter_spell_scripts()
new spell_hun_kill_command_pet();
new spell_hun_last_stand_pet();
new spell_hun_lock_and_load();
new spell_hun_lock_and_load_dummy();
new spell_hun_masters_call();
new spell_hun_misdirection();
new spell_hun_misdirection_proc();