From 3fcd868b6767095c623e0daea1122a2c19bd6765 Mon Sep 17 00:00:00 2001 From: Josh Roy <10731363+JRoy@users.noreply.github.com> Date: Mon, 14 Jun 2021 07:18:16 -0400 Subject: [PATCH] Fix NPE in UserData#getHome --- Essentials/src/main/java/com/earth2me/essentials/UserData.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/UserData.java b/Essentials/src/main/java/com/earth2me/essentials/UserData.java index fbac7339026..a215d2002ba 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/UserData.java +++ b/Essentials/src/main/java/com/earth2me/essentials/UserData.java @@ -155,7 +155,8 @@ private String getHomeName(String search) { public Location getHome(final String name) throws Exception { final String search = getHomeName(name); - return holder.homes().get(search).location(); + final LazyLocation loc = holder.homes().get(search); + return loc != null ? loc.location() : null; } public Location getHome(final Location world) {