Remove potential NPE issues

BentoBoxWorld · Jul 9, 2021 · f564055 · f564055
1 parent fce0806
commit f564055
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/main/java/world/bentobox/border/listeners/PlayerListener.java b/src/main/java/world/bentobox/border/listeners/PlayerListener.java
@@ -1,6 +1,7 @@
 package world.bentobox.border.listeners;
 
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
@@ -119,7 +120,7 @@ public void onPlayerLeaveIsland(PlayerMoveEvent e) {
      * @return true if outside the island protection zone
      */
     private boolean outsideCheck(Player player, Location from, Location to) {
-        User user = User.getInstance(player);
+        User user = Objects.requireNonNull(User.getInstance(player));
 
         if ((from.getWorld() != null && from.getWorld().equals(to.getWorld())
                 && from.toVector().multiply(XZ).equals(to.toVector().multiply(XZ)))

diff --git a/src/main/java/world/bentobox/border/listeners/ShowBarrier.java b/src/main/java/world/bentobox/border/listeners/ShowBarrier.java
@@ -3,6 +3,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 
@@ -56,7 +57,7 @@ public ShowBarrier(Border addon) {
     public void showBorder(Player player, Island island) {
 
         if (addon.getSettings().getDisabledGameModes().contains(island.getGameMode())
-                || !User.getInstance(player).getMetaData(BORDER_STATE_META_DATA).map(MetaDataValue::asBoolean).orElse(addon.getSettings().isShowByDefault())) {
+                || !Objects.requireNonNull(User.getInstance(player)).getMetaData(BORDER_STATE_META_DATA).map(MetaDataValue::asBoolean).orElse(addon.getSettings().isShowByDefault())) {
             return;
         }
 

diff --git a/src/main/java/world/bentobox/border/listeners/ShowWorldBorder.java b/src/main/java/world/bentobox/border/listeners/ShowWorldBorder.java
@@ -1,5 +1,7 @@
 package world.bentobox.border.listeners;
 
+import java.util.Objects;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.RegisteredServiceProvider;
@@ -40,7 +42,7 @@ public ShowWorldBorder(Border addon) {
     public void showBorder(Player player, Island island) {
         worldBorderApi.resetWorldBorderToGlobal(player);
         if (addon.getSettings().getDisabledGameModes().contains(island.getGameMode())
-                || !User.getInstance(player).getMetaData(BORDER_STATE_META_DATA).map(MetaDataValue::asBoolean).orElse(addon.getSettings().isShowByDefault())) {
+                || !Objects.requireNonNull(User.getInstance(player)).getMetaData(BORDER_STATE_META_DATA).map(MetaDataValue::asBoolean).orElse(addon.getSettings().isShowByDefault())) {
             return;
         }
         worldBorderApi.setBorder(player, island.getProtectionRange() * 2D, island.getProtectionCenter());