Core/Players: Corrected shield block value calculations

Port From (https://github.com/TrinityCore/TrinityCore/commit/31d3080091643d4e348ec53c5bec3caf0e17110f)
2021-02-21 21:44:30 -05:00
parent baa44cc4ee
commit 26c57969fb
5 changed files with 20 additions and 9 deletions
@@ -89,8 +89,6 @@ namespace Game.Entities
            SendPacket(packet);
        }

-        public override uint GetBlockPercent() { return m_activePlayerData.ShieldBlock; }
-
        bool CanTitanGrip() { return m_canTitanGrip; }

        float GetRatingMultiplier(CombatRating cr)
@@ -344,6 +342,17 @@ namespace Game.Entities
                UpdateDamagePhysical(attType);
        }

+        public override float GetBlockPercent(uint attackerLevel)
+        {
+            float blockArmor = (float)m_activePlayerData.ShieldBlock;
+            float armorConstant = Global.DB2Mgr.EvaluateExpectedStat(ExpectedStatType.ArmorConstant, attackerLevel, -2, 0, Class.None);
+
+            if ((blockArmor + armorConstant) == 0)
+                return 0;
+
+            return Math.Min(blockArmor / (blockArmor + armorConstant), 0.85f);
+        }
+        
        public void SetCanParry(bool value)
        {
            if (m_canParry == value)