From f0c90fe8ca6787eda6594928c643d8eb31f2d44a Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 20 Jul 2016 19:29:16 +0200 Subject: [PATCH] partialy revert previous commit --- src/server/game/Entities/Unit/Unit.cpp | 3 ++- src/server/game/Spells/SpellMgr.cpp | 7 ------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4f56b38dd7c..a75ea084236 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12815,7 +12815,8 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u bool prepare = i->aura->CallScriptPrepareProcHandlers(aurApp, eventInfo); - Milliseconds cooldown = Milliseconds::zero(); + //Milliseconds cooldown = Milliseconds::zero(); // temp revert. dig for the 3.3.5a commit changing this. + uint32 cooldown = 0; if (prepare && i->spellProcEvent && i->spellProcEvent->cooldown) cooldown = i->spellProcEvent->cooldown; diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 34762d7dd5f..254689d8574 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3367,13 +3367,6 @@ void SpellMgr::LoadSpellInfoCorrections() spellInfo->Effects[EFFECT_0].TargetA = SpellImplicitTargetInfo(TARGET_UNIT_SRC_AREA_ENTRY); break; case 46842: // Flame Ring - case 46836: // Flame Patch - spellInfo->Effects[EFFECT_0].TargetA = SpellImplicitTargetInfo(); - break; - case 29726: // Test Ribbon Pole Channel - spellInfo->InterruptFlags &= ~AURA_INTERRUPT_FLAG_CAST; - break; - case 46842: // Flame Ring case 46836: // Flame Patch spellInfo->Effects[EFFECT_0].TargetA = SpellImplicitTargetInfo(); break;