*New SQL to fix broken data blobs, if any. Must be run manually.

*Cleanup, fix some typos, and fix the final heal of Lifebloom. Thanks ogeraisi.

--HG--
branch : trunk

src/game/SpellAuras.cpp

@@ -3107,7 +3107,7 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
             // Lifebloom
             if ( GetSpellProto()->SpellFamilyFlags[1] & 0x10 )
             {
-                if (!apply )
+                if (!apply)
                 {
                     // Final heal only on dispelled or duration end
                     if (GetParentAura()->GetRemoveMode() != AURA_REMOVE_BY_EXPIRE && GetParentAura()->GetRemoveMode() != AURA_REMOVE_BY_ENEMY_SPELL)
@@ -3117,7 +3117,8 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                     //if(m_target->IsInWorld())
                     // This may be a hack, but we need a way to count healing bonus three times
                     for(uint8 i = 0; i < GetParentAura()->GetStackAmount(); ++i)
-                        m_target->CastCustomSpell(m_target,33778,&m_amount,NULL,NULL,true,NULL,this,GetCasterGUID());
+                    // Update: apparently not anymore, it should only count once, so.. commented out.
+                    m_target->CastCustomSpell(m_target,33778,&m_amount,NULL,NULL,true,NULL,this,GetCasterGUID());
 
                     // restore mana
                     if (caster)

src/game/SpellAuras.h

@@ -83,7 +83,7 @@ class TRINITY_DLL_SPEC Aura
         void SetProcDamage(uint32 val) { m_procDamage = val; }
         uint32 GetProcDamage() const { return m_procDamage; }
 
-        int8 GetStackAmount() const {return m_stackAmount;}
+        uint8 GetStackAmount() const { return m_stackAmount; }
         void SetStackAmount(uint8 num, bool applied = true);
         bool modStackAmount(int32 num); // return true if last charge dropped
 
@@ -154,7 +154,7 @@ class TRINITY_DLL_SPEC Aura
         uint8 m_auraFlags;                                  // Aura info flag (for send data to client)
         uint8 m_auraLevel;                                  // Aura level (store caster level for correct show level dep amount)
         uint8 m_procCharges;                                // Aura charges (0 for infinite)
-        uint8 m_stackAmount;                                // Aura stack amount
+        
         AuraEffect * m_partAuras[3];
 
         uint32 m_procDamage;                                // used in aura proc code