Merge branch 'holychowders/fix_issue_#1061_combat_rating_affected_by_buffs' into 'master'

Fix issue #1061 - Combat Rating is Affected by Buffs

Closes #1061

See merge request veloren/veloren!2084

CHANGELOG.md

@@ -50,6 +50,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Flying agents raycast more angles to check for obstacles.
 - Mouse Cursor now locks to the center of the screen when menu is not open
 - Social window no longer moves when group is open
+- Combat rating no longer takes buffs into account
 
 ## [0.9.0] - 2021-03-20
 

common/src/combat.rs

@@ -789,7 +789,7 @@ pub fn combat_rating(
     // Assumes a "standard" max health of 100
     let health_rating = health.base_max() as f32
         / 100.0
-        / (1.0 - Damage::compute_damage_reduction(Some(inventory), Some(stats))).max(0.00001);
+        / (1.0 - Damage::compute_damage_reduction(Some(inventory), None)).max(0.00001);
 
     // Assumes a standard person has earned 20 skill points in the general skill
     // tree and 10 skill points for the weapon skill tree