From f2d651f6a91069b9e93c49127ca3f1cc297a63a6 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 5 Feb 2022 00:00:55 +0100 Subject: [PATCH] Core/Units: no longer normalize melee basic attacks of feral druids --- src/server/game/Entities/Unit/Unit.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 00a73ee1d9f..eb1e5845bcb 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -305,7 +305,8 @@ Unit::Unit(bool isWorldObject) : m_vehicleKit(nullptr), m_unitTypeMask(UNIT_MASK_NONE), m_Diminishing(), m_isEngaged(false), m_combatManager(this), m_threatManager(this), i_AI(nullptr), m_aiLocked(false), _lastDamagedTime(0), - m_spellHistory(new SpellHistory(this)), _isIgnoringCombat(false) + m_spellHistory(new SpellHistory(this)), _isIgnoringCombat(false), + _destLocCastIndex(0) { m_objectType |= TYPEMASK_UNIT; m_objectTypeId = TYPEID_UNIT; @@ -1278,7 +1279,7 @@ void Unit::CalculateMeleeDamage(Unit* victim, uint32 damage, CalcDamageInfo* dam return; } - damage += CalculateDamage(damageInfo->attackType, IsInFeralForm(), true); + damage += CalculateDamage(damageInfo->attackType, false, true); // Add melee damage bonus damage = MeleeDamageBonusDone(damageInfo->target, damage, damageInfo->attackType); damage = damageInfo->target->MeleeDamageBonusTaken(this, damage, damageInfo->attackType);