1. From 732d4af506bdddf0bad638b2737517bf5dc9502c Mon Sep 17 00:00:00 2001
  2. From: Northstrider <[email protected]>
  3. Date: Wed, 6 Feb 2013 19:13:31 +0100
  4. Subject: [PATCH] Core/Units: updated combat damage reduction to cataclysm.
  5. this will fix the relisience damage bug.
  7. ---
  8. src/server/game/Entities/Unit/Unit.cpp | 21 +++++++++++++--------
  9. 1 file changed, 13 insertions(+), 8 deletions(-)
  11. diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
  12. index 37fbf93..17516d7 100644
  13. --- a/src/server/game/Entities/Unit/Unit.cpp
  14. +++ b/src/server/game/Entities/Unit/Unit.cpp
  15. @@ -15741,20 +15741,25 @@ void Unit::KnockbackFrom(float x, float y, float speedXY, float speedZ)
  17. float Unit::GetCombatRatingReduction(CombatRating cr) const
  18. {
  19. - if (Player const* player = ToPlayer())
  20. - return player->GetRatingBonusValue(cr);
  21. - // Player's pet get resilience from owner
  22. - else if (isPet() && GetOwner())
  23. - if (Player* owner = GetOwner()->ToPlayer())
  24. - return owner->GetRatingBonusValue(cr);
  25. + if (GetTypeId() == TYPEID_PLAYER)
  26. + return ((Player const*)this)->GetRatingBonusValue(cr);
  27. + else if (((Creature const*)this)->isPet())
  28. + {
  29. + // Player's pet get resilience from owner
  30. + if (Unit* owner = GetOwner())
  31. + if (owner->GetTypeId() == TYPEID_PLAYER)
  32. + return ((Player*)owner)->GetRatingBonusValue(cr);
  33. + }
  35. return 0.0f;
  36. }
  38. uint32 Unit::GetCombatRatingDamageReduction(CombatRating cr, float rate, float cap, uint32 damage) const
  39. {
  40. - float percent = std::min(GetCombatRatingReduction(cr) * rate, cap);
  41. - return CalculatePct(damage, percent);
  42. + float percent = GetCombatRatingReduction(cr) * rate;
  43. + if (percent > cap)
  44. + percent = cap;
  45. + return uint32 (percent * damage / 100.0f);
  46. }
  48. uint32 Unit::GetModelForForm(ShapeshiftForm form) const
  49. --
  50. 1.7.10.msysgit.1