diff options
| -rw-r--r-- | sql/base/world_database.sql | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 16 |
2 files changed, 7 insertions, 11 deletions
diff --git a/sql/base/world_database.sql b/sql/base/world_database.sql index 9c12aeb1d27..b9b1f5ec4d5 100644 --- a/sql/base/world_database.sql +++ b/sql/base/world_database.sql @@ -19469,6 +19469,8 @@ INSERT INTO `spell_proc_event` (`entry`,`SchoolMask`,`SpellFamilyName`,`SpellFam ( 72858, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 100, 0), -- Gaseous Bloat ( 72859, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000004, 0x00000000, 0, 100, 0), -- Gaseous Bloat ( 72860, 0x00, 0, 0x00000000, 0x00000000, 0x00000000 ,0x00000004, 0x00000000, 0, 100, 0), -- Gaseous Bloat +( 75475, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Item - Chamber of Aspects 25 Tank Trinket +( 75481, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Item - Chamber of Aspects 25 Heroic Tank Trinket ( 75474, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Charred Twilight Scale (Heroic) ( 75465, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Charred Twilight Scale ( 75457, 0x00, 0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0, 0, 45), -- Sharpened Twilight Scale (Heroic) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 93fee0c7f95..4ff8e80291a 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -8639,14 +8639,6 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig return false; break; } - // Evasive Maneuvers (Commendation of Kael`thas trinket) - case 45057: - { - // reduce you below $s1% health - if ((GetHealth() - damage) > CalculatePctN(GetMaxHealth(), triggerAmount)) - return false; - break; - } // Rapid Recuperation case 53228: case 53232: @@ -8688,9 +8680,11 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig if (pVictim) pVictim->CastSpell(pVictim, trigger_spell_id, true); // EffectImplicitTarget is self return true; - // Item - Chamber of Aspects 25 Normal/Heroic Tank Trinket - case 75475: - case 75481: + case 45057: // Evasive Maneuvers (Commendation of Kael`thas trinket) + case 71634: // Item - Icecrown 25 Normal Tank Trinket 1 + case 71640: // Item - Icecrown 25 Heroic Tank Trinket 1 + case 75475: // Item - Chamber of Aspects 25 Normal Tank Trinket + case 75481: // Item - Chamber of Aspects 25 Heroic Tank Trinket { // Procs only if damage takes health below $s1% if (!HealthBelowPctDamaged(triggerAmount, damage)) |