From 3cd93f39dd5d565dece0b5d4cad47025dc407814 Mon Sep 17 00:00:00 2001
From: tastybento <tastybento@wasteofplastic.com>
Date: Sun, 8 Aug 2021 17:36:03 -0700
Subject: [PATCH] Objects.requireNonNull for User

---
 src/main/java/world/bentobox/warps/WarpSignsManager.java  | 4 ++--
 .../world/bentobox/warps/listeners/WarpSignsListener.java | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/world/bentobox/warps/WarpSignsManager.java b/src/main/java/world/bentobox/warps/WarpSignsManager.java
index 17c9268..3eeba4e 100644
--- a/src/main/java/world/bentobox/warps/WarpSignsManager.java
+++ b/src/main/java/world/bentobox/warps/WarpSignsManager.java
@@ -322,7 +322,7 @@ public class WarpSignsManager {
         if (!prefix.isEmpty())
         {
             icon = Material.matchMaterial(
-                    this.getPermissionValue(User.getInstance(uuid),
+                    this.getPermissionValue(Objects.requireNonNull(User.getInstance(uuid)),
                             prefix + "island.warp",
                             this.addon.getSettings().getIcon()));
         }
@@ -352,7 +352,7 @@ public class WarpSignsManager {
         final Location actualWarp = new Location(inFront.getWorld(), inFront.getBlockX() + 0.5D, inFront.getBlockY(),
                 inFront.getBlockZ() + 0.5D, yaw, 30F);
         Util.teleportAsync(user.getPlayer(), actualWarp, TeleportCause.COMMAND);
-        User warpOwner = User.getInstance(signOwner);
+        User warpOwner = Objects.requireNonNull(User.getInstance(signOwner));
         // Hide invisible players
         if (warpOwner.isOnline() && !warpOwner.getPlayer().canSee(user.getPlayer())) {
             return;
diff --git a/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java b/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java
index e0800f6..6eddf0a 100644
--- a/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java
+++ b/src/main/java/world/bentobox/warps/listeners/WarpSignsListener.java
@@ -3,6 +3,7 @@ package world.bentobox.warps.listeners;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 
 import org.bukkit.Bukkit;
@@ -84,14 +85,14 @@ public class WarpSignsListener implements Listener {
     public void onPlayerLeave(TeamLeaveEvent e) {
         // Remove any warp signs from this game mode
         addon.getWarpSignsManager().removeWarp(e.getIsland().getWorld(), e.getPlayerUUID());
-        User.getInstance(e.getPlayerUUID()).sendMessage("warps.deactivate");
+        Objects.requireNonNull(User.getInstance(e.getPlayerUUID())).sendMessage("warps.deactivate");
     }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onPlayerLeave(TeamKickEvent e) {
         // Remove any warp signs from this game mode
         addon.getWarpSignsManager().removeWarp(e.getIsland().getWorld(), e.getPlayerUUID());
-        User.getInstance(e.getPlayerUUID()).sendMessage("warps.deactivate");
+        Objects.requireNonNull(User.getInstance(e.getPlayerUUID())).sendMessage("warps.deactivate");
     }
 
     /**
@@ -111,6 +112,7 @@ public class WarpSignsListener implements Listener {
             return;
         }
         User user = User.getInstance(e.getPlayer());
+        if (user == null) return;
         UUID owner = addon.getWarpSignsManager().getWarpOwnerUUID(b.getLocation()).orElse(null);
         if (isPlayersSign(e.getPlayer(), b, inWorld)) {
             addon.getWarpSignsManager().removeWarp(b.getLocation());
@@ -149,7 +151,7 @@ public class WarpSignsListener implements Listener {
             return;
         }
         String title = e.getLine(0);
-        User user = User.getInstance(e.getPlayer());
+        User user = Objects.requireNonNull(User.getInstance(e.getPlayer()));
         // Check if someone is changing their own sign
         if (title.equalsIgnoreCase(addon.getSettings().getWelcomeLine())) {
             // Welcome sign detected - check permissions