From 4fc5446a135bc3c2e6e39f4abcf29ba87574bffc Mon Sep 17 00:00:00 2001
From: Byron Marohn <Combustible@live.com>
Date: Tue, 21 Apr 2026 04:29:15 +0000
Subject: [PATCH] Prevent NPE in WaypointManager when rolling-average world is
 unloaded

---
 .../scriptedquests/managers/WaypointManager.java              | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugin/src/main/java/com/playmonumenta/scriptedquests/managers/WaypointManager.java b/plugin/src/main/java/com/playmonumenta/scriptedquests/managers/WaypointManager.java
index ce11e72e..dce718cd 100644
--- a/plugin/src/main/java/com/playmonumenta/scriptedquests/managers/WaypointManager.java
+++ b/plugin/src/main/java/com/playmonumenta/scriptedquests/managers/WaypointManager.java
@@ -194,9 +194,7 @@ public void run() {
 					if (averageLoc == null) {
 						averageLoc = playerLoc.clone();
 					} else {
-						if (averageLoc.getWorld() != player.getWorld()) {
-							averageLoc.setWorld(player.getWorld());
-						}
+						averageLoc.setWorld(player.getWorld());
 					}
 					averageLoc = averageLoc.add(playerLoc).multiply(0.5d);
 					mPlayerAverageLocs.put(player.getUniqueId(), averageLoc);