From ad4fb8c1df3330761dcc59a5c44169af059b8a1e Mon Sep 17 00:00:00 2001
From: kobewi <kobewi4e@gmail.com>
Date: Thu, 4 Dec 2025 23:27:06 +0100
Subject: [PATCH] Fix built-in script live reloading

---
 core/debugger/remote_debugger.cpp      | 10 +++++++++-
 editor/script/script_editor_plugin.cpp |  6 +++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/debugger/remote_debugger.cpp b/core/debugger/remote_debugger.cpp
index 06cfbdfb9fb..c4adfae12a9 100644
--- a/core/debugger/remote_debugger.cpp
+++ b/core/debugger/remote_debugger.cpp
@@ -681,7 +681,15 @@ void RemoteDebugger::poll_events(bool p_is_idle) {
 			for (const Variant &v : script_paths_to_reload) {
 				const String &path = v;
 				Error err = OK;
-				Ref<Script> script = ResourceLoader::load(path, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err);
+				Ref<Script> script = ResourceCache::get_ref(path);
+				if (script.is_null()) {
+					if (path.is_resource_file()) {
+						script = ResourceLoader::load(path, "", ResourceFormatLoader::CACHE_MODE_REUSE, &err);
+					} else {
+						// Built-in script that isn't in ResourceCache, no need to reload.
+						continue;
+					}
+				}
 				ERR_CONTINUE_MSG(err != OK, vformat("Could not reload script '%s': %s", path, error_names[err]));
 				ERR_CONTINUE_MSG(script.is_null(), vformat("Could not reload script '%s': Not a script!", path, error_names[err]));
 				scripts_to_reload.push_back(script);
diff --git a/editor/script/script_editor_plugin.cpp b/editor/script/script_editor_plugin.cpp
index 08481f11b0c..9926db73903 100644
--- a/editor/script/script_editor_plugin.cpp
+++ b/editor/script/script_editor_plugin.cpp
@@ -1119,14 +1119,14 @@ void ScriptEditor::_mark_built_in_scripts_as_saved(const String &p_parent_path)
 		}
 
 		Ref<Resource> edited_res = se->get_edited_resource();
-
 		if (!edited_res->is_built_in()) {
 			continue; // External script, who cares.
 		}
 
-		if (edited_res->get_path().get_slice("::", 0) == p_parent_path) {
-			se->tag_saved_version();
+		if (edited_res->get_path().get_slice("::", 0) != p_parent_path) {
+			continue; // Wrong scene.
 		}
+		se->tag_saved_version();
 
 		Ref<Script> scr = edited_res;
 		if (scr.is_valid()) {