diff options
| author | QAston <qaston@gmail.com> | 2011-09-22 02:03:14 -0700 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2011-09-22 02:03:14 -0700 |
| commit | 29fef71137a43360f41af50ab53e0edbb75bb318 (patch) | |
| tree | 8889416686313ee9951413b20fc3a923ed12056a | |
| parent | 562f528f87ef9f24088f2d300fe356282ff083b2 (diff) | |
| parent | 63318f009e682faa41f8f17bea0f458408aa5e2f (diff) | |
Merge pull request #2915 from idostyle/armorPen
Core/Mechanics: Cap armorPen to maxArmorPen - prevents having armor penetration rating greater than 100%.
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 077bde85162..d6199cbd910 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -1584,7 +1584,7 @@ uint32 Unit::CalcArmorReducedDamage(Unit* victim, const uint32 damage, SpellInfo // Figure out how much armor do we ignore float armorPen = CalculatePctF(maxArmorPen, ToPlayer()->GetRatingBonusValue(CR_ARMOR_PENETRATION)); // Got the value, apply it - armor -= armorPen; + armor -= std::min(armorPen, maxArmorPen); } if (armor < 0.0f) |