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

Merge :(

Browse Source 
--HG--
branch : trunk
This commit is contained in:
_manuel_
2010-01-05 21:50:11 -03:00
parent 0bd566213a b56b2c2a43
commit c454c2a15a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/updates/6898_world_spell_proc_event.sql
View File

@@ -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

4
src/game/Spell.cpp
View File

@@ -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