diff options
| author | _manuel_ <none@none> | 2010-01-05 21:50:11 -0300 |
|---|---|---|
| committer | _manuel_ <none@none> | 2010-01-05 21:50:11 -0300 |
| commit | c454c2a15a71b7f3bb0a123d770c41cb2df6188d (patch) | |
| tree | 4e79da9c5f6b4871a8fdcb997955c31bfd12e959 | |
| parent | 0bd566213a74214553ca734ab08f4b8cd9430559 (diff) | |
| parent | b56b2c2a4339073456290079fc4bfb2bf0b6b5ed (diff) | |
Merge :(
--HG--
branch : trunk
| -rw-r--r-- | sql/updates/6898_world_spell_proc_event.sql | 2 | ||||
| -rw-r--r-- | src/game/Spell.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/updates/6898_world_spell_proc_event.sql b/sql/updates/6898_world_spell_proc_event.sql index 2dda27a4a79..4751b9d29b4 100644 --- a/sql/updates/6898_world_spell_proc_event.sql +++ b/sql/updates/6898_world_spell_proc_event.sql @@ -1,2 +1,2 @@ -DELETE FROM spell_proc_event WHERE entry = 58387;
+DELETE FROM spell_proc_event WHERE entry = 58387; INSERT INTO spell_proc_event VALUES(58387, 0, 4, 16384, 64, 0, 16, 0, 0, 0, 0); -- Glyph of Sunder Armor
\ No newline at end of file diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 9aa54f9b14e..1d855f727cf 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -1099,9 +1099,9 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target) } } - // Do not take combo points on dodge + // Do not take combo points on dodge and miss if (m_needComboPoints && m_targets.getUnitTargetGUID() == target->targetGUID) - if( missInfo != SPELL_MISS_NONE && missInfo != SPELL_MISS_MISS) + if (missInfo != SPELL_MISS_NONE) m_needComboPoints = false; // Trigger info was not filled in spell::preparedatafortriggersystem - we do it now |