From 9802d23832f6c0095dd3887916244df740994299 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Tue, 19 May 2026 23:06:16 -0400
Subject: [PATCH] Fix NPE on brand new player join

---
 .../dev/plex/listener/impl/PlayerListener.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/dev/plex/listener/impl/PlayerListener.java b/server/src/main/java/dev/plex/listener/impl/PlayerListener.java
index 5625303..0af5c4f 100644
--- a/server/src/main/java/dev/plex/listener/impl/PlayerListener.java
+++ b/server/src/main/java/dev/plex/listener/impl/PlayerListener.java
@@ -26,7 +26,7 @@ public class PlayerListener extends ServerListenerBase
     }
 
     // setting up a player's data
-    @EventHandler(priority = EventPriority.HIGHEST)
+    @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerSetup(PlayerJoinEvent event)
     {
         Player player = event.getPlayer();
@@ -60,6 +60,19 @@ public class PlayerListener extends ServerListenerBase
             }
         }
         plugin.getPlayerCache().getPlexPlayerMap().put(player.getUniqueId(), plexPlayer);
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST)
+    public void onPlayerJoin(PlayerJoinEvent event)
+    {
+        Player player = event.getPlayer();
+        PlexPlayer plexPlayer = plugin.getPlayerService().getPlayer(player.getUniqueId());
+        if (plexPlayer == null)
+        {
+            PlexLog.warn("Unable to load Plex player data for {0}; skipping join metadata.", player.getName());
+            return;
+        }
+
         if (plexPlayer.isLockedUp())
         {
             player.openInventory(player.getInventory());