From 3eee1d973033eb362e9d8f26a8b813dd60f0b515 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 23 Dec 2014 22:15:30 +0100 Subject: Core/Players: Fixed melee damage --- src/server/game/Entities/Player/Player.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 86dba7e2148..7f04e1aa101 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -5558,7 +5558,7 @@ float Player::GetRatingMultiplier(CombatRating cr) const GtCombatRatingsEntry const* Rating = sGtCombatRatingsStore.EvaluateTable(level - 1, cr); // gtOCTClassCombatRatingScalarStore.dbc starts with 1, CombatRating with zero, so cr+1 GtOCTClassCombatRatingScalarEntry const* classRating = sGtOCTClassCombatRatingScalarStore.EvaluateTable(cr + 1, getClass() - 1); - if (!Rating || !classRating) + if (!Rating || !classRating || !Rating->ratio) return 1.0f; // By default use minimum coefficient (not must be called) return classRating->ratio / Rating->ratio; @@ -8039,7 +8039,7 @@ void Player::_ApplyWeaponDamage(uint8 slot, Item* item, bool apply) } float minDamage, maxDamage; - proto->GetBaseDamage(minDamage, maxDamage); + item->GetDamage(minDamage, maxDamage); if (minDamage > 0) { -- cgit v1.2.3