Merge branch 'ohmslawfornormalweapons' into 'master'

Don't apply normal weapon resistance twice for NPC victims (#8124)

Closes #8124

See merge request OpenMW/openmw!4337

CHANGELOG.md

@@ -189,6 +189,7 @@
     Bug #8064: Lua move360 script doesn't respect the enableZoom/disableZoom Camera interface setting
     Bug #8085: Don't search in scripts or shaders directories for "Select directories you wish to add" menu in launcher
     Bug #8097: GetEffect doesn't detect 0 magnitude spells
+    Bug #8124: Normal weapon resistance is applied twice for NPCs
     Feature #1415: Infinite fall failsafe
     Feature #2566: Handle NAM9 records for manual cell references
     Feature #3501: OpenMW-CS: Instance Editing - Shortcuts for axial locking

apps/openmw/mwclass/npc.cpp

@@ -755,9 +755,6 @@ namespace MWClass
         if (!object.isEmpty())
             stats.setLastHitObject(object.getCellRef().getRefId());
 
-        if (damage > 0.0f && !object.isEmpty())
-            MWMechanics::resistNormalWeapon(ptr, attacker, object, damage);
-
         if (damage < 0.001f)
             damage = 0;