diff options
| author | QAston <none@none> | 2010-01-10 14:51:34 +0100 |
|---|---|---|
| committer | QAston <none@none> | 2010-01-10 14:51:34 +0100 |
| commit | feb7acf8aae7b7446f7565933fd90bd08a76b37e (patch) | |
| tree | d1ea4502a6caaa320071ab67f1d87818daa06e13 | |
| parent | 3f6ad61905c380a7366ff4d9e82267d7b46fd680 (diff) | |
*spell_linked_spell entry for Deterrance. Resolves #237.
--HG--
branch : trunk
| -rw-r--r-- | sql/updates/6941_world_spell_linked_spell.sql | 3 | ||||
| -rw-r--r-- | sql/world.sql | 1 | ||||
| -rw-r--r-- | src/game/SpellAuraEffects.cpp | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/sql/updates/6941_world_spell_linked_spell.sql b/sql/updates/6941_world_spell_linked_spell.sql new file mode 100644 index 00000000000..d7e583b70b3 --- /dev/null +++ b/sql/updates/6941_world_spell_linked_spell.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_linked_spell` WHERE `spell_trigger` = 19263 AND `spell_effect` = 67801; +INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment`) VALUES +( 19263, 67801, 2, 'Deterrence');
\ No newline at end of file diff --git a/sql/world.sql b/sql/world.sql index d96b4c4487a..1c99fd11847 100644 --- a/sql/world.sql +++ b/sql/world.sql @@ -5517,6 +5517,7 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment (-59907, 7, 0, 'Lightwell Charges - Suicide'), ( 26022, 61417, 2, 'Pursuit of Justice'), ( 26023, 61418, 2, 'Pursuit of Justice'), +( 19263, 67801, 2, 'Deterrence'), -- Quest ( 40214, 40216, 2, 'Dragonmaw Illusion'), ( 40214, 42016, 2, 'Dragonmaw Illusion'), diff --git a/src/game/SpellAuraEffects.cpp b/src/game/SpellAuraEffects.cpp index 952ae649214..14161feac2e 100644 --- a/src/game/SpellAuraEffects.cpp +++ b/src/game/SpellAuraEffects.cpp @@ -5840,6 +5840,8 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo break; } case SPELLFAMILY_PALADIN: + if (!(mode & AURA_EFFECT_HANDLE_REAL)) + break; switch (GetSpellProto()->SpellIconID) { // Blessing of Sanctuary @@ -5847,8 +5849,8 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo case 19: case 1804: { - if (!caster || !target) - return; + if (!caster) + break; if (apply) { @@ -5859,7 +5861,7 @@ void AuraEffect::HandleAuraDummy(AuraApplication const * aurApp, uint8 mode, boo else target->RemoveAura(67480, GetCasterGUID()); - return; + break; } } break; |