diff --git a/data/sql/updates/pending_db_world/rev_1572032036915466688.sql b/data/sql/updates/pending_db_world/rev_1572032036915466688.sql new file mode 100644 index 000000000..ca502ad9a --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1572032036915466688.sql @@ -0,0 +1,7 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1572032036915466688'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 24 AND `SourceEntry` IN (48539,48544,48545); +INSERT INTO `conditions`(`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(24, 0, 48539, 0, 0, 1, 1, 70405, 0, 0, 1, 0, 0, '', 'Revitalize (Rank 1) - cannot proc if target has Mutated abomination aura ICC - 10 or 25'), +(24, 0, 48544, 0, 0, 1, 1, 70405, 0, 0, 1, 0, 0, '', 'Revitalize (Rank 2) - cannot proc if target has Mutated abomination aura ICC - 10 or 25'), +(24, 0, 48545, 0, 0, 1, 1, 70405, 0, 0, 1, 0, 0, '', 'Revitalize (Rank 3) - cannot proc if target has Mutated abomination aura ICC - 10 or 25'); diff --git a/src/server/game/Spells/Auras/SpellAuras.cpp b/src/server/game/Spells/Auras/SpellAuras.cpp index 96e030a2a..bfd94e77a 100644 --- a/src/server/game/Spells/Auras/SpellAuras.cpp +++ b/src/server/game/Spells/Auras/SpellAuras.cpp @@ -1628,7 +1628,7 @@ void Aura::HandleAuraSpecificMods(AuraApplication const* aurApp, Unit* caster, b break; } case POWER_RAGE: triggeredSpellId = 63653; break; - case POWER_ENERGY: triggeredSpellId = 63655; break; + case POWER_ENERGY: triggeredSpellId = (!target->HasAura(70405) ? 63655 : 0); break; case POWER_RUNIC_POWER: triggeredSpellId = 63652; break; default: break;