Core/Spells: Change the radius of PBAoEs following the feedback received on (#16290)

(cherry picked from commit 2ff76e828f7c757b5120aba41947a6d63e082e17)

3 files changed, 0 insertions, 34 deletions

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index f9c6b64e7f3..270843e6e92 100644
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -1241,10 +1241,6 @@ void Spell::SelectImplicitAreaTargets(SpellEffIndex effIndex, SpellImplicitTarge
         return;
     float radius = effect->CalcRadius(m_caster) * m_spellValue->RadiusMod;
 
-    // if this is a proximity based aoe (Frost Nova, Psychic Scream, ...), include the caster's own combat reach
-    if (targetType.IsProximityBasedAoe())
-        radius += GetCaster()->GetCombatReach();
-
     SearchAreaTargets(targets, radius, center, referer, targetType.GetObjectType(), targetType.GetCheckType(), effect->ImplicitTargetConditions);
 
     CallScriptObjectAreaTargetSelectHandlers(targets, effIndex, targetType);
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 8dc5af047ec..084695559bd 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -75,35 +75,6 @@ bool SpellImplicitTargetInfo::IsArea() const
     return GetSelectionCategory() == TARGET_SELECT_CATEGORY_AREA || GetSelectionCategory() == TARGET_SELECT_CATEGORY_CONE;
 }
 
-bool SpellImplicitTargetInfo::IsProximityBasedAoe() const
-{
-    switch (_target)
-    {
-    case TARGET_UNIT_SRC_AREA_ENTRY:
-    case TARGET_UNIT_SRC_AREA_ENEMY:
-    case TARGET_UNIT_CASTER_AREA_PARTY:
-    case TARGET_UNIT_SRC_AREA_ALLY:
-    case TARGET_UNIT_SRC_AREA_PARTY:
-    case TARGET_UNIT_LASTTARGET_AREA_PARTY:
-    case TARGET_GAMEOBJECT_SRC_AREA:
-    case TARGET_UNIT_CASTER_AREA_RAID:
-    case TARGET_CORPSE_SRC_AREA_ENEMY:
-        return true;
-
-    case TARGET_UNIT_DEST_AREA_ENTRY:
-    case TARGET_UNIT_DEST_AREA_ENEMY:
-    case TARGET_UNIT_DEST_AREA_ALLY:
-    case TARGET_UNIT_DEST_AREA_PARTY:
-    case TARGET_GAMEOBJECT_DEST_AREA:
-    case TARGET_UNIT_TARGET_AREA_RAID_CLASS:
-        return false;
-
-    default:
-        TC_LOG_WARN("spells", "SpellImplicitTargetInfo::IsProximityBasedAoe called a non-aoe spell");
-        return false;
-    }
-}
-
 SpellTargetSelectionCategories SpellImplicitTargetInfo::GetSelectionCategory() const
 {
     return _data[_target].SelectionCategory;
diff --git a/src/server/game/Spells/SpellInfo.h b/src/server/game/Spells/SpellInfo.h
index 4af84e40376..5a5afeff4ee 100644
--- a/src/server/game/Spells/SpellInfo.h
+++ b/src/server/game/Spells/SpellInfo.h
@@ -286,7 +286,6 @@ public:
     SpellImplicitTargetInfo(uint32 target);
 
     bool IsArea() const;
-    bool IsProximityBasedAoe() const;
     SpellTargetSelectionCategories GetSelectionCategory() const;
     SpellTargetReferenceTypes GetReferenceType() const;
     SpellTargetObjectTypes GetObjectType() const;