From 7ad424c3893c63d8d7ff48396858e7506b598e99 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Thu, 6 Mar 2025 01:44:12 +0100
Subject: [PATCH] Fixed and improved location resolve in actor editing.

---
 src/actors.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/actors.js b/src/actors.js
index b4acd09..9b29e55 100644
--- a/src/actors.js
+++ b/src/actors.js
@@ -947,6 +947,10 @@ function getDeltas(edits, baseActor, options) {
 
 			const countryKey = key.includes('origin') ? 'originCountry' : 'residenceCountry';
 
+			if (!resolvedLocation.country) {
+				return null;
+			}
+
 			return [
 				{
 					key: countryKey,
@@ -957,11 +961,11 @@ function getDeltas(edits, baseActor, options) {
 				},
 				{
 					key: key.includes('origin') ? 'originState' : 'residenceState',
-					value: resolvedLocation.state,
+					value: resolvedLocation.state || null, // explicitly unset to prevent outcomes like Los Angeles, Greenland
 				},
 				{
 					key: key.includes('origin') ? 'originCity' : 'residenceCity',
-					value: resolvedLocation.city,
+					value: resolvedLocation.city || null,
 				},
 			];
 		}