diff options
| author | Shauren <none@none> | 2010-09-08 11:22:51 +0200 |
|---|---|---|
| committer | Shauren <none@none> | 2010-09-08 11:22:51 +0200 |
| commit | 5c13a08d87b7de7b0daea0656deb84cf2107b15f (patch) | |
| tree | ec2a4c7d402910f660b915e566cac6e9e597ada4 | |
| parent | e5d612d33962ad2c5dc21f85a8abe77d6a63db12 (diff) | |
Core/Spells: Fixed The Art of War procing only on melee attacks, by tassader1000
Core/Spells: Added missing change in previous revision
Closes issue #2386.
--HG--
branch : trunk
| -rw-r--r-- | sql/base/world_database.sql | 4 | ||||
| -rw-r--r-- | sql/updates/9829_world_spell_proc_event.sql | 1 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index 53281916c70..28a9c759db7 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -18961,8 +18961,8 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam ( 53381, 0x00, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- Righteous Vengeance (Rank 2) ( 53382, 0x00, 10, 0x00800000, 0x00020000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- Righteous Vengeance (Rank 3) ( 53397, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Invigoration (Rank 1) -( 53486, 0x00, 10, 0x00800000, 0x00028000, 0x00000000, 0x00000004, 0x00040002, 0, 0, 0), -- The Art of War (Rank 1) -( 53488, 0x00, 10, 0x00800000, 0x00028000, 0x00000000, 0x00000004, 0x00040002, 0, 0, 0), -- The Art of War (Rank 2) +( 53486, 0x00, 10, 0x00800000, 0x00028000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- The Art of War (Rank 1) +( 53488, 0x00, 10, 0x00800000, 0x00028000, 0x00000000, 0x00000000, 0x00040002, 0, 0, 0), -- The Art of War (Rank 2) ( 53501, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Sheath of Light (Rank 1) ( 53502, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Sheath of Light (Rank 2) ( 53503, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0, 0, 0), -- Sheath of Light (Rank 3) diff --git a/sql/updates/9829_world_spell_proc_event.sql b/sql/updates/9829_world_spell_proc_event.sql new file mode 100644 index 00000000000..322dadd174e --- /dev/null +++ b/sql/updates/9829_world_spell_proc_event.sql @@ -0,0 +1 @@ +UPDATE `spell_proc_event` SET `procFlags`=0 WHERE `entry` IN (53486,53488); diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index de027769740..fa38c250cee 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5736,7 +5736,7 @@ SpellCastResult Spell::CheckCast(bool strict) // check if caster has at least 1 combo point for spells that require combo points if (m_needComboPoints) if (Player* plrCaster = m_caster->ToPlayer()) - if (!m_caster->ToPlayer()->GetComboPoints()) + if (!plrCaster->GetComboPoints()) return SPELL_FAILED_NO_COMBO_POINTS; // don't allow channeled spells / spells with cast time to be casted while moving |