diff options
| -rw-r--r-- | sql/updates/6898_world_spell_proc_event.sql | 2 | ||||
| -rw-r--r-- | src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp | 5 | ||||
| -rw-r--r-- | src/game/Spell.cpp | 4 |
3 files changed, 8 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/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp index aff7a1a45b0..a8141edb987 100644 --- a/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp +++ b/src/bindings/scripts/scripts/northrend/ulduar/halls_of_stone/halls_of_stone.cpp @@ -632,6 +632,11 @@ struct TRINITY_DLL_DECL npc_brann_hosAI : public npc_escortAI bIsLowHP = true; } else if (bIsLowHP && (m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) > 30) bIsLowHP = false; + + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); } }; diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 6db68f9a92c..3d053ebb8b9 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 |