From e5d43b9c59d805ad5abeb69236c3a01851ede619 Mon Sep 17 00:00:00 2001 From: Tuxity Date: Wed, 15 Aug 2012 22:49:44 +0200 Subject: [PATCH] Core/Stats: Fix a damage bug when you go into a druid's form --- src/server/game/Entities/Player/Player.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 6a4e4ff02e..1915e2094a 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -8167,7 +8167,7 @@ void Player::_ApplyWeaponDamage(uint8 slot, ItemTemplate const* proto, ScalingSt SetBaseWeaponDamage(attType, MAXDAMAGE, damage); } - if (proto->Delay && !IsInFeralForm()) + if (proto->Delay) { if (slot == EQUIPMENT_SLOT_RANGED) SetAttackTime(RANGED_ATTACK, apply ? proto->Delay: BASE_ATTACK_TIME); @@ -8177,10 +8177,6 @@ void Player::_ApplyWeaponDamage(uint8 slot, ItemTemplate const* proto, ScalingSt SetAttackTime(OFF_ATTACK, apply ? proto->Delay: BASE_ATTACK_TIME); } - // No need to modify any physical damage for ferals as it is calculated from stats only - if (IsInFeralForm()) - return; - if (CanModifyStats() && (damage || proto->Delay)) UpdateDamagePhysical(attType); }