*Fix the bug that startfall aoe damage also apply on direct target.

*Add starfall spell bonus for other ranks. By Uruviel and Nesocip.

--HG--
branch : trunk

2 files changed, 14 insertions, 1 deletions

diff --git a/sql/updates/3391_world_spell_bonus_data.sql b/sql/updates/3391_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..aa876760aee
--- /dev/null
+++ b/sql/updates/3391_world_spell_bonus_data.sql
@@ -0,0 +1,10 @@
+DELETE FROM `spell_bonus_data` WHERE `entry` IN (50288,50294,53191,53188,53194,53189,53195,53190);
+INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `comments`) VALUES
+(50288, 0.05, 0, 0, 'Druid - Starfall rank 1'),
+(50294, 0.012, 0, 0, 'Druid - Starfall AOE rank 1'),
+(53191, 0.05, 0, 0, 'Druid - Starfall rank 2'),
+(53188, 0.012, 0, 0, 'Druid - Starfall AOE rank 2'),
+(53194, 0.05, 0, 0, 'Druid - Starfall rank 3'),
+(53189, 0.012, 0, 0, 'Druid - Starfall AOE rank 3'),
+(53195, 0.05, 0, 0, 'Druid - Starfall rank 4'),
+(53190, 0.012, 0, 0, 'Druid - Starfall AOE rank 4');
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 8a067ec734d..5de2f843c87 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -3281,9 +3281,12 @@ void SpellMgr::LoadSpellCustomAttr()
         switch(spellInfo->SpellFamilyName)
         {
             case SPELLFAMILY_DRUID:
-                // starfall
+                // Starfall Target Selection
                 if(spellInfo->SpellFamilyFlags[2] & 0x100)
                     spellInfo->MaxAffectedTargets = 2;
+                // Starfall AOE Damage
+                else if(spellInfo->SpellFamilyFlags[2] & 0x800000)
+                    mSpellCustomAttr[i] |= SPELL_ATTR_CU_EXCLUDE_SELF;
                 // Wild growth
                 else if(spellInfo->SpellFamilyFlags[1] & 0x4000000)
                     spellInfo->MaxAffectedTargets = 5;