From 0b6b0f9c615992fcf7d62714c568a6f02b6fd1e7 Mon Sep 17 00:00:00 2001
From: Josh Roy <10731363+JRoy@users.noreply.github.com>
Date: Fri, 9 Jul 2021 12:33:44 -0400
Subject: [PATCH] Fix NPE with custom join messages (#4334)

This fixes a bug in #4290 in which custom join messages would throw a NullPointerException if the user hasn't changed their username.
---
 .../java/com/earth2me/essentials/EssentialsPlayerListener.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
index edef4169225..6b0746590f6 100644
--- a/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
+++ b/Essentials/src/main/java/com/earth2me/essentials/EssentialsPlayerListener.java
@@ -346,7 +346,7 @@ public void run() {
                         .replace("{UPTIME}", DateUtil.formatDateDiff(ManagementFactory.getRuntimeMXBean().getStartTime()))
                         .replace("{PREFIX}", FormatUtil.replaceFormat(ess.getPermissionsHandler().getPrefix(player)))
                         .replace("{SUFFIX}", FormatUtil.replaceFormat(ess.getPermissionsHandler().getSuffix(player)))
-                        .replace("{OLDUSERNAME}", lastAccountName);
+                        .replace("{OLDUSERNAME}", lastAccountName == null ? "" : lastAccountName);
                     if (!msg.isEmpty()) {
                         ess.getServer().broadcastMessage(msg);
                     }