From 9b09ce53ef713e821bc416d186fad40e9fc69fee Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 3 Jan 2025 19:30:36 +0300
Subject: [PATCH] Don't stagger creatures in the middle of an attack (#8275)

---
 apps/openmw/mwmechanics/character.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index c0359881b65..c22308bce48 100644
--- 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))