*Fix Ferocious Bite energy to dmg conversion

*Remove duplicated AP coefficients for Hammer of Wrath and Avengers Shield
*Correctly do effectaddcombopoints for spells which take them.
*Do not proc spelleffects on player login.

--HG--
branch : trunk

1 files changed, 3 insertions, 2 deletions

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index f77f3d01acc..4bbd1f06faa 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2497,8 +2497,9 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real, bool changeAmount)
                     ((Player*)m_target)->RemoveAmmo();      // not use ammo and not allow use
                 return;
             case 52916:  // Honor Among Thieves
-               if (Unit * target = ObjectAccessor::GetUnit(*m_target, m_target->GetUInt64Value(UNIT_FIELD_TARGET)))
-                   m_target->CastSpell(target, 51699, true);
+                if(m_target->GetTypeId()==TYPEID_PLAYER)
+                    if (Unit * target = ObjectAccessor::GetUnit(*m_target,((Player*)m_target)->GetComboTarget()))
+                        m_target->CastSpell(target, 51699, true);
                return;
         }