*Add coeficient for lifebloom final healing and temporary set amount of it to not increase while spell is stacked, proc improved mana shield with riptide.

--HG--
branch : trunk

6 files changed, 15 insertions, 4 deletions

diff --git a/sql/updates/2013_world.sql b/sql/updates/2013_world.sql
index ae697a245e3..1efc20f41e0 100644
--- a/sql/updates/2013_world.sql
+++ b/sql/updates/2013_world.sql
@@ -2,4 +2,4 @@
 DELETE FROM `spell_proc_event` WHERE `entry` IN (44745, 54787, 58426, 31221, 31222, 31223);
 INSERT INTO `spell_proc_event` VALUES
 (44745, 0x00, 3, 0x00000000, 0x00000001, 0x00000000, 0x00008000, 0x0002000, 0.000000, 0.000000, 0),
-(54787, 0x00, 3, 0x00000000, 0x00000001, 0x00000000, 0x00008000, 0x0002000, 0.000000, 0.000000, 0),
\ No newline at end of file
+(54787, 0x00, 3, 0x00000000, 0x00000001, 0x00000000, 0x00008000, 0x0002000, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/sql/updates/2774_world_spell_proc_event.sql b/sql/updates/2774_world_spell_proc_event.sql
index 343d908a568..458ba82eec8 100644
--- a/sql/updates/2774_world_spell_proc_event.sql
+++ b/sql/updates/2774_world_spell_proc_event.sql
@@ -2,7 +2,7 @@ DELETE FROM `spell_proc_event` WHERE `entry` IN (56337, 56336, 56333, 58426, 312
 INSERT INTO `spell_proc_event` VALUES
 (56337, 0x00, 9, 0x00000004, 0x00000000, 0x00000040, 0x00022200, 0x0000000, 0.000000, 0.000000, 0),
 (56336, 0x00, 9, 0x00000004, 0x00000000, 0x00000040, 0x00022200, 0x0000000, 0.000000, 0.000000, 0),
-(56333, 0x00, 9, 0x00000004, 0x00000000, 0x00000040, 0x00022200, 0x0000000, 0.000000, 0.000000, 0);
+(56333, 0x00, 9, 0x00000004, 0x00000000, 0x00000040, 0x00022200, 0x0000000, 0.000000, 0.000000, 0),
 
 -- Overkill
 (58426, 0x00, 8, 0x400000, 0x00000000, 0x00000000, 0x00014000, 0x0006001, 0.000000, 0.000000, 0),
diff --git a/sql/updates/2792_world_spell_bonus_data.sql b/sql/updates/2792_world_spell_bonus_data.sql
new file mode 100644
index 00000000000..674a68fe60a
--- /dev/null
+++ b/sql/updates/2792_world_spell_bonus_data.sql
@@ -0,0 +1,3 @@
+DELETE FROM `spell_bonus_data` WHERE entry IN (33778);
+INSERT INTO `spell_bonus_data` VALUES
+(33778, 0.6453, 0, 0, "Lifebloom- final effect");
diff --git a/sql/updates/2792_world_spell_proc_event.sql b/sql/updates/2792_world_spell_proc_event.sql
new file mode 100644
index 00000000000..4c1ec0b4fe7
--- /dev/null
+++ b/sql/updates/2792_world_spell_proc_event.sql
@@ -0,0 +1,5 @@
+DELETE FROM `spell_proc_event` WHERE `entry` IN (16180, 16198, 16196);
+INSERT INTO `spell_proc_event` VALUES
+(16180, 0x00, 11, 0x000000C0, 0x00000000, 0x00000010, 0x00000000, 0x0000002, 0.000000, 0.000000, 0),
+(16198, 0x00, 11, 0x000000C0, 0x00000000, 0x00000010, 0x00000000, 0x0000002, 0.000000, 0.000000, 0),
+(16196, 0x00, 11, 0x000000C0, 0x00000000, 0x00000010, 0x00000000, 0x0000002, 0.000000, 0.000000, 0);
\ No newline at end of file
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 9a682ed22b0..8664988d03e 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2598,6 +2598,9 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real)
                     if (GetParentAura()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE && GetParentAura()->GetRemoveMode() != AURA_REMOVE_BY_ENEMY_SPELL)
                         return;
 
+                    // Not needed in 3.1
+                    m_amount /=GetParentAura()->GetStackAmount();
+
                     // final heal
                     if(m_target->IsInWorld())
                         m_target->CastCustomSpell(m_target,33778,&m_amount,NULL,NULL,true,NULL,this,GetCasterGUID());
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index eedfe3d1973..e554883ad9c 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -3959,7 +3959,7 @@ void Unit::RemoveAurasDueToSpellByDispel(uint32 spellId, uint64 casterGUID, Unit
                 int32 damage = aur->GetPartAura(0)->GetAmount()*9;
                 RemoveAuraFromStack(iter, AURA_REMOVE_BY_ENEMY_SPELL);
                 // backfire damage and silence
-                dispeler->CastCustomSpell(dispeler, 31117, &damage, NULL, NULL, true, NULL, NULL,dispeler->GetGUID());
+                dispeler->CastCustomSpell(dispeler, 31117, &damage, NULL, NULL, true, NULL, NULL,GetGUID());
                 return;
             }
             RemoveAuraFromStack(iter, AURA_REMOVE_BY_ENEMY_SPELL);
@@ -6482,7 +6482,7 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                             continue;
 
                         basepoints0 = CalculateSpellDamage(procSpell,i,procSpell->EffectBasePoints[i],this) * 0.4f;
-                        CastCustomSpell(this,triggered_spell_id,&basepoints0,NULL,NULL,true,castItem,triggeredByAura);
+                        CastCustomSpell(this,triggered_spell_id,&basepoints0,NULL,NULL,true,NULL,triggeredByAura);
                     }
                     return true;
                 }