Merge branch 'cheaterrats' into 'master'

Don't stagger creatures in the middle of an attack (#8275) Closes #8275 See merge request OpenMW/openmw!4499
OpenMW · Jan 4, 2025 · 9f90349 · 9f90349
2 parents f6efb28 + 9b09ce5
commit 9f90349
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
@@ -403,6 +403,12 @@ namespace MWMechanics
             resetCurrentIdleState();
         }
 
+        if (!mPtr.getClass().isNpc() && mUpperBodyState > UpperBodyState::WeaponEquipped)
+        {
+            recovery = false;
+            stats.setHitRecovery(false);
+        }
+
         if (mHitState != CharState_None)
         {
             if (!mAnimation->isPlaying(mCurrentHit))