Core/Spells: Spell radius calculation update

2 files changed, 7 insertions, 2 deletions

diff --git a/src/server/game/DataStores/DBCStructure.h b/src/server/game/DataStores/DBCStructure.h
index c26898abf21..f997aaf776f 100644
--- a/src/server/game/DataStores/DBCStructure.h
+++ b/src/server/game/DataStores/DBCStructure.h
@@ -1564,8 +1564,8 @@ struct SpellRadiusEntry
 {
     uint32      ID;                                         // 0
     //float     Radius;                                     // 1
-    float       RadiusMin;                                  // 2
-    float       RadiusPerLevel;                             // 3
+    float       RadiusPerLevel;                             // 2
+    float       RadiusMin;                                  // 3
     float       RadiusMax;                                  // 4
 };
 
diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp
index 2a72cdc49be..eb09cc60a1f 100644
--- a/src/server/game/Spells/SpellInfo.cpp
+++ b/src/server/game/Spells/SpellInfo.cpp
@@ -642,6 +642,11 @@ float SpellEffectInfo::CalcRadius(Unit* caster, Spell* spell) const
         return 0.0f;
 
     float radius = entry->RadiusMin;
+
+    // Client uses max if min is 0
+    if (radius == 0.0f)
+        radius = entry->RadiusMax;
+
     if (caster)
     {
         radius += entry->RadiusPerLevel * caster->getLevel();