From ec52be44d12c7055da1eca3be416a083e5bfb1c2 Mon Sep 17 00:00:00 2001
From: SleepyGemmy <99297919+SleepyGemmy@users.noreply.github.com>
Date: Fri, 6 May 2022 13:56:10 +0200
Subject: [PATCH] Landmark Bugfix (#13782)

---
 code/modules/mob/abstract/observer/observer.dm | 2 +-
 html/changelogs/landmark_bugfix.yml            | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 html/changelogs/landmark_bugfix.yml

diff --git a/code/modules/mob/abstract/observer/observer.dm b/code/modules/mob/abstract/observer/observer.dm
index 14a283a12d6..66501b47cc5 100644
--- a/code/modules/mob/abstract/observer/observer.dm
+++ b/code/modules/mob/abstract/observer/observer.dm
@@ -83,7 +83,7 @@
 	if(!T)
 		if(length(latejoin))
 			T = pick(latejoin)			//Safety in case we cannot find the body's position
-		else if(length(force_spawnpoints["Anyone"]))
+		else if(current_map.force_spawnpoint && length(force_spawnpoints["Anyone"]))
 			T = pick(force_spawnpoints["Anyone"])
 		else
 			T = locate(1, 1, 1)
diff --git a/html/changelogs/landmark_bugfix.yml b/html/changelogs/landmark_bugfix.yml
new file mode 100644
index 00000000000..43ddc47261d
--- /dev/null
+++ b/html/changelogs/landmark_bugfix.yml
@@ -0,0 +1,6 @@
+author: SleepyGemmy
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixes a runtime related to observers and landmarks."
\ No newline at end of file