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

Core/Spells: Fixed issues with spells using MaxRadius not considering radius spellmods.

Browse Source
This commit is contained in:
Warpten
2014-01-14 20:37:17 +01:00
parent 4d80611a10
commit f9ccb6f585
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/server/game/Spells/SpellInfo.cpp
View File

@@ -613,22 +613,15 @@ bool SpellEffectInfo::HasMaxRadius() const
float SpellEffectInfo::CalcRadius(Unit* caster, Spell* spell) const
{
if (!HasRadius())
{
if (HasMaxRadius())
{
//! Still not sure which to pick. Anyway at the current time (Patch 4.3.4) most of the spell effects
//! have no radius mod per level, and RadiusMin is equal to RadiusMax.
return MaxRadiusEntry->RadiusMin;
}
return 0.0f;
}
const SpellRadiusEntry* entry = RadiusEntry;
if (!HasRadius() && HasMaxRadius())
entry = MaxRadiusEntry;
float radius = RadiusEntry->RadiusMin;
float radius = entry->RadiusMin;
if (caster)
{
radius += RadiusEntry->RadiusPerLevel * caster->getLevel();
radius = std::min(radius, RadiusEntry->RadiusMax);
radius += entry->RadiusPerLevel * caster->getLevel();
radius = std::min(radius, entry->RadiusMax);
if (Player* modOwner = caster->GetSpellModOwner())
modOwner->ApplySpellMod(_spellInfo->Id, SPELLMOD_RADIUS, radius, spell);
}