Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

partialy revert previous commit

Browse Source
This commit is contained in:
Aokromes
2016-07-20 19:29:16 +02:00
parent 3fa8965fff
commit f0c90fe8ca
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/server/game/Entities/Unit/Unit.cpp
View File

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

7
src/server/game/Spells/SpellMgr.cpp
View File

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