Refactor and check respawn location for null before finding bed block

Author: benwoo1110

src/main/java/org/mvplugins/multiverse/inventories/share/Sharables.java

@@ -17,6 +17,7 @@
 import org.bukkit.potion.PotionEffect;
 import org.mvplugins.multiverse.core.economy.MVEconomist;
 
+import javax.annotation.Nullable;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -492,19 +493,7 @@ public void updateProfile(PlayerProfile profile, Player player) {
                     Location bedSpawnLocation = null;
                     try {
                         Logging.finer("profile bed: " + player.getBedSpawnLocation());
-                        bedSpawnLocation = player.getBedSpawnLocation();
-
-                        var blockBedSpawnLocation = bedSpawnLocation.getBlock().getLocation();
-                        for(int x = -1; x <= 1; x++) {
-                            for(int z = -1; z <= 1; z++) {
-                                var newBedLoc = blockBedSpawnLocation.clone().add(x, 0, z);
-                                Logging.finest("new bed: " + newBedLoc);
-                                if (newBedLoc.getBlock().getBlockData() instanceof Bed) {
-                                    bedSpawnLocation = newBedLoc;
-                                    break;
-                                }
-                            }
-                        }
+                        bedSpawnLocation = findBedFromRespawnLocation(player.getBedSpawnLocation());
                     } catch (NullPointerException e) {
                         // TODO this is a temporary fix for the bug occurring in 1.16.X CB/Spigot/Paper
                         StackTraceElement[] stackTrace = e.getStackTrace();
@@ -527,12 +516,29 @@ public boolean updatePlayer(Player player, PlayerProfile profile) {
                         return false;
                     }
                     player.setBedSpawnLocation(loc, true);
-                    Logging.finer("update bed: " + player.getBedSpawnLocation());
+                    Logging.finer("updating bed: " + player.getBedSpawnLocation());
                     return true;
                 }
             }).serializer(new ProfileEntry(false, DataStrings.PLAYER_BED_SPAWN_LOCATION), new LocationSerializer())
             .altName("bedspawn").altName("bed").altName("beds").altName("bedspawns").build();
 
+    private static @Nullable Location findBedFromRespawnLocation(@Nullable Location respawnLocation) {
+        if (respawnLocation == null) {
+            return null;
+        }
+        var blockBedSpawnLocation = respawnLocation.getBlock().getLocation();
+        for(int x = -1; x <= 1; x++) {
+            for(int z = -1; z <= 1; z++) {
+                var newBedLoc = blockBedSpawnLocation.clone().add(x, 0, z);
+                Logging.finest("Finding bed at: " + newBedLoc);
+                if (newBedLoc.getBlock().getBlockData() instanceof Bed) {
+                    return newBedLoc;
+                }
+            }
+        }
+        return respawnLocation;
+    }
+
     /**
      * Sharing Last Location.
      */