From 56c05fe5d5a1b1f6850b8d8c59f388139f8b8e3a Mon Sep 17 00:00:00 2001
From: Relintai <relintai@relintai.net>
Date: Sun, 11 May 2025 18:56:21 +0200
Subject: [PATCH] Use the owner UserManager when saving Users.

---
 modules/users/users/user.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/users/users/user.cpp b/modules/users/users/user.cpp
index d22fdb773..cea0884e6 100644
--- a/modules/users/users/user.cpp
+++ b/modules/users/users/user.cpp
@@ -303,7 +303,17 @@ void User::from_json(const String &data) {
 }
 
 void User::save() {
-	UserDB::get_singleton()->save_user(Ref<User>(this));
+	if (_owner_user_manager == ObjectID()) {
+		// Fallback, owner was not set. Maybe should just complain instead?
+		UserDB::get_singleton()->save_user(Ref<User>(this));
+		return;
+	}
+
+	UserManager *owner_user_manager = ObjectDB::get_instance<UserManager>(_owner_user_manager);
+
+	ERR_FAIL_COND(!owner_user_manager);
+
+	owner_user_manager->save_user(Ref<User>(this));
 }
 
 void User::read_lock() {