From 5b6ded05a215180ca69b8bcf5578a9f439a92652 Mon Sep 17 00:00:00 2001
From: MrJeremyFisher <63616270+MrJeremyFisher@users.noreply.github.com>
Date: Wed, 21 Feb 2024 17:13:52 -0500
Subject: [PATCH] Fix null connection error

---
 .../civcraft/mc/namelayer/listeners/AssociationListener.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/plugins/namelayer-paper/src/main/java/vg/civcraft/mc/namelayer/listeners/AssociationListener.java b/plugins/namelayer-paper/src/main/java/vg/civcraft/mc/namelayer/listeners/AssociationListener.java
index 8d64cb6f9..a4007a928 100644
--- a/plugins/namelayer-paper/src/main/java/vg/civcraft/mc/namelayer/listeners/AssociationListener.java
+++ b/plugins/namelayer-paper/src/main/java/vg/civcraft/mc/namelayer/listeners/AssociationListener.java
@@ -58,10 +58,7 @@ public void OnPlayerJoin(PlayerJoinEvent event) {
 		UUID uuid = event.getPlayer().getUniqueId();
 		associations.addPlayer(playername, uuid);
 		event.setJoinMessage(ChatColor.YELLOW + NameAPI.getCurrentName(uuid) + " joined the game");
-	}
 
-	@EventHandler(priority = EventPriority.LOWEST)
-	public void OnPlayerLogin(PlayerLoginEvent event) {
 		final Player player = event.getPlayer();
 		MojangNames.declareMojangName(player.getUniqueId(), player.getName());
 		String name = associations.getCurrentName(player.getUniqueId());
@@ -71,6 +68,7 @@ public void OnPlayerLogin(PlayerLoginEvent event) {
 			name = associations.getCurrentName(player.getUniqueId());
 		}
 
+
 		if (game != null)
 			game.setPlayerProfile(player, name);
 	}