From 6f9b813bd1da8cbb9896e42fffb5a5db0644877d Mon Sep 17 00:00:00 2001
From: Evil Eye <malusluminis@hotmail.com>
Date: Mon, 14 Jul 2025 22:39:19 +0200
Subject: [PATCH] Mark scripts on newly scripted, active objects as active

---
 apps/openmw/mwlua/localscripts.cpp  | 13 ++++++++-----
 apps/openmw/mwlua/localscripts.hpp  |  2 +-
 apps/openmw/mwlua/luamanagerimp.cpp |  3 +++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/apps/openmw/mwlua/localscripts.cpp b/apps/openmw/mwlua/localscripts.cpp
index 4bdfb0d13a..d784328035 100644
--- a/apps/openmw/mwlua/localscripts.cpp
+++ b/apps/openmw/mwlua/localscripts.cpp
@@ -235,13 +235,16 @@ namespace MWLua
             &mOnSkillLevelUp });
     }
 
-    void LocalScripts::setActive(bool active)
+    void LocalScripts::setActive(bool active, bool callHandlers)
     {
         mData.mIsActive = active;
-        if (active)
-            callEngineHandlers(mOnActiveHandlers);
-        else
-            callEngineHandlers(mOnInactiveHandlers);
+        if (callHandlers)
+        {
+            if (active)
+                callEngineHandlers(mOnActiveHandlers);
+            else
+                callEngineHandlers(mOnInactiveHandlers);
+        }
     }
 
     void LocalScripts::applyStatsCache()
diff --git a/apps/openmw/mwlua/localscripts.hpp b/apps/openmw/mwlua/localscripts.hpp
index adbf20292d..146eff95ba 100644
--- a/apps/openmw/mwlua/localscripts.hpp
+++ b/apps/openmw/mwlua/localscripts.hpp
@@ -67,7 +67,7 @@ namespace MWLua
         MWBase::LuaManager::ActorControls* getActorControls() { return &mData.mControls; }
         const MWWorld::Ptr& getPtrOrEmpty() const { return mData.ptrOrEmpty(); }
 
-        void setActive(bool active);
+        void setActive(bool active, bool callHandlers = true);
         bool isActive() const override { return mData.mIsActive; }
         void onConsume(const LObject& consumable) { callEngineHandlers(mOnConsumeHandlers, consumable); }
         void onActivated(const LObject& actor) { callEngineHandlers(mOnActivatedHandlers, actor); }
diff --git a/apps/openmw/mwlua/luamanagerimp.cpp b/apps/openmw/mwlua/luamanagerimp.cpp
index 5fa2d9867c..2fd7618ad7 100644
--- a/apps/openmw/mwlua/luamanagerimp.cpp
+++ b/apps/openmw/mwlua/luamanagerimp.cpp
@@ -540,7 +540,10 @@ namespace MWLua
             localScripts = createLocalScripts(ptr);
             localScripts->addAutoStartedScripts();
             if (ptr.isInCell() && MWBase::Environment::get().getWorldScene()->isCellActive(*ptr.getCell()))
+            {
+                localScripts->setActive(true, false);
                 mActiveLocalScripts.insert(localScripts);
+            }
         }
         localScripts->addCustomScript(scriptId, initData);
     }