Merge pull request #87 from H0zen/develop21

[Spell] Fix Mind Soothe aggro.

src/game/Object/Unit.cpp

@@ -1754,12 +1754,9 @@ void Unit::DealMeleeDamage(CalcDamageInfo* damageInfo, bool durabilityLoss)
                 alreadyDone.insert(*i);
                 uint32 damage = (*i)->GetModifier()->m_amount;
                 SpellEntry const* i_spellProto = (*i)->GetSpellProto();
-                // Calculate absorb resist ??? no data in opcode for this possibly unable to absorb or resist?
-                // uint32 absorb;
-                // uint32 resist;
-                // CalcAbsorbResist(pVictim, SpellSchools(spellProto->School), SPELL_DIRECT_DAMAGE, damage, &absorb, &resist);
-                // damage-=absorb + resist;
 
+                //apply bonus damage from existing auras with id = 14 (SPELL_AURA_MOD_DAMAGE_TAKEN)
+                damage += SpellBaseDamageBonusTaken(GetSpellSchoolMask(i_spellProto));
                 pVictim->DealDamageMods(this, damage, NULL);
 
                 WorldPacket data(SMSG_SPELLDAMAGESHIELD, (8 + 8 + 4 + 4));

src/game/WorldHandlers/Spell.cpp

@@ -1183,6 +1183,10 @@ void Spell::DoSpellHitOnUnit(Unit* unit, uint32 effectMask, bool isReflected)
 
                 switch (m_spellInfo->Id)
                 {
+                         // Mind Soothe (all ranks)
+                    case 453:
+                    case 8192:
+                    case 10953:
                         //Soothe animal
                     case 9901:
                     case 8955: