From fe7970421f8b6a07a92026912987dbfeb17433c2 Mon Sep 17 00:00:00 2001
From: Alexei Kotov <alexdobrohotov@yandex.ru>
Date: Fri, 11 Jul 2025 11:10:02 +0300
Subject: [PATCH] Don't harvest if player activation is blocked (#8612)

---
 apps/openmw/mwclass/container.cpp | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwclass/container.cpp b/apps/openmw/mwclass/container.cpp
index c8b1f05972..fff191c22d 100644
--- a/apps/openmw/mwclass/container.cpp
+++ b/apps/openmw/mwclass/container.cpp
@@ -192,12 +192,13 @@ namespace MWClass
         {
             if (!isTrapped)
             {
-                if (canBeHarvested(ptr))
-                {
-                    return std::make_unique<MWWorld::ActionHarvest>(ptr);
-                }
+                if (!canBeHarvested(ptr))
+                    return std::make_unique<MWWorld::ActionOpen>(ptr);
 
-                return std::make_unique<MWWorld::ActionOpen>(ptr);
+                if (hasToolTip(ptr))
+                    return std::make_unique<MWWorld::ActionHarvest>(ptr);
+
+                return std::make_unique<MWWorld::FailedAction>(std::string_view{}, ptr);
             }
             else
             {