diff options
| author | joschiwald <joschiwald.trinity@gmail.com> | 2017-10-03 22:15:41 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-10-03 22:15:41 +0200 |
| commit | e6f8821bd08f55c2fc54807af19dbedb15697f9e (patch) | |
| tree | c2146e7845c68090192407e686f0c8ac631e853b /src/server/game/Spells/Spell.cpp | |
| parent | 88ae5f6068c158ab342c7dc0c3396d8426306952 (diff) | |
Dropped obsolete code added in 2d75d8071bb6d85987bdc5d88ed2271822fcbcfd
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index bc19e1cc51d..92faf274ee5 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -2633,19 +2633,18 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA aura_effmask |= 1 << effect->EffectIndex; // Get Data Needed for Diminishing Returns, some effects may have multiple auras, so this must be done on spell hit, not aura add - bool const triggered = m_triggeredByAuraSpell != nullptr; - DiminishingGroup const diminishGroup = m_spellInfo->GetDiminishingReturnsGroupForSpell(triggered); + DiminishingGroup const diminishGroup = m_spellInfo->GetDiminishingReturnsGroupForSpell(); DiminishingLevels diminishLevel = DIMINISHING_LEVEL_1; if (diminishGroup && aura_effmask) { diminishLevel = unit->GetDiminishing(diminishGroup); - DiminishingReturnsType type = m_spellInfo->GetDiminishingReturnsGroupType(triggered); + DiminishingReturnsType type = m_spellInfo->GetDiminishingReturnsGroupType(); // Increase Diminishing on unit, current informations for actually casts will use values above if ((type == DRTYPE_PLAYER && (unit->GetCharmerOrOwnerPlayerOrPlayerItself() || (unit->GetTypeId() == TYPEID_UNIT && unit->ToCreature()->GetCreatureTemplate()->flags_extra & CREATURE_FLAG_EXTRA_ALL_DIMINISH))) || type == DRTYPE_ALL) - unit->IncrDiminishing(m_spellInfo, triggered); + unit->IncrDiminishing(m_spellInfo); } if (aura_effmask) @@ -2692,7 +2691,7 @@ SpellMissInfo Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool scaleA // Now Reduce spell duration using data received at spell hit int32 duration = m_spellAura->GetMaxDuration(); - float diminishMod = unit->ApplyDiminishingToDuration(aurSpellInfo, triggered, duration, m_originalCaster, diminishLevel); + float diminishMod = unit->ApplyDiminishingToDuration(aurSpellInfo, duration, m_originalCaster, diminishLevel); // unit is immune to aura if it was diminished to 0 duration if (diminishMod == 0.0f) |