Merge dev branch

Author: Dreeam-qwq

README.md

@@ -1,6 +1,6 @@
 # RandomSpawnPlus5
 
-🔀 A random spawn plugin for Minecraft 1.19.
+🔀 A random spawn plugin for Minecraft 1.19.2
 
 Native support 1.19.2
 

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>systems.kscott</groupId>
     <artifactId>randomspawnplus</artifactId>
-    <version>5.0.2</version>
+    <version>5.0.3</version>
     <packaging>jar</packaging>
 
     <name>RandomSpawnPlus</name>

src/main/java/systems/kscott/randomspawnplus/spawn/SpawnCacher.java

@@ -27,7 +27,6 @@ public SpawnCacher(RandomSpawnPlus plugin) {
         this.spawnsRequireSaving = false;
         this.cachedSpawns = new ArrayList<>();
         cacheSpawns();
-        runWatchdog();
     }
 
     public static void initialize(RandomSpawnPlus plugin) {
@@ -102,38 +101,12 @@ public Location getRandomSpawn() {
     }
 
     public void deleteSpawn(Location location) {
-        for (Iterator<String> iterator = cachedSpawns.iterator(); iterator.hasNext(); ) {
-            String locationString = iterator.next();
-            //Bukkit.getLogger().info(Locations.serializeString(location)+", "+locationString);
-            if (Locations.serializeString(location).equals(locationString)) {
-                iterator.remove();
-            }
-        }
-        cachedSpawns.removeIf(locationString -> locationString.equals(Locations.serializeString(location)));
+        cachedSpawns.removeIf(locationString -> Locations.serializeString(location).equals(locationString));
         spawnsRequireSaving = true;
     }
 
     public void save() {
         plugin.getSpawnsManager().getConfig().set("spawns", cachedSpawns);
         plugin.getSpawnsManager().save();
     }
-
-    private void runWatchdog() {
-        new BukkitRunnable() {
-
-            List<String> spawnCopy = new ArrayList<>(cachedSpawns);
-
-            @Override
-            public void run() {
-                if (spawnCopy != cachedSpawns) {
-                    List<String> spawnCopyCopy = new ArrayList<>(spawnCopy);
-                    List<String> cachedSpawnsCopy = new ArrayList<>(cachedSpawns);
-
-                    spawnCopyCopy.forEach(cachedSpawnsCopy::remove);
-                    save();
-                    spawnCopy = new ArrayList<>(cachedSpawns);
-                }
-            }
-        }.runTaskTimerAsynchronously(plugin, 0, 200);
-    }
 }

src/main/java/systems/kscott/randomspawnplus/spawn/SpawnFinder.java

@@ -1,9 +1,7 @@
 package systems.kscott.randomspawnplus.spawn;
 
-import org.bukkit.Bukkit;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import io.papermc.lib.PaperLib;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.configuration.file.FileConfiguration;
 import systems.kscott.randomspawnplus.RandomSpawnPlus;
@@ -16,6 +14,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
 
 public class SpawnFinder {
 
@@ -53,11 +53,18 @@ public static SpawnFinder getInstance() {
     public Location getCandidateLocation() {
         String worldString = config.getString("respawn-world");
 
+        if (worldString == null) {
+            plugin.getLogger().severe("You've incorrectly defined the `respawn-world` key in the config.");
+            plugin.getServer().getPluginManager().disablePlugin(plugin);
+            return null;
+        }
+
         World world = Bukkit.getWorld(worldString);
 
         if (world == null) {
             plugin.getLogger().severe("The world '" + worldString + "' is invalid. Please change the 'respawn-world' key in the config.");
             plugin.getServer().getPluginManager().disablePlugin(plugin);
+            return null;
         }
 
         int minX = config.getInt("spawn-range.min-x");
@@ -166,18 +173,20 @@ public boolean checkSpawn(Location location) {
 
         Location locClone = location.clone();
 
-        if (locClone == null) {
+        Chunk chunk;
+
+        CompletableFuture<Chunk> chunkCompletableFuture = PaperLib.getChunkAtAsync(location);
+
+        try {
+            chunk = chunkCompletableFuture.get();
+        } catch (InterruptedException | ExecutionException e) {
+            e.printStackTrace();
             return false;
         }
-        // 89apt89 start - Fix Paper method use
-        if (!location.getChunk().isLoaded()) {
-            location.getChunk().load();
-        }
-        // 89apt89 end
 
-        Block block0 = locClone.getBlock();
-        Block block1 = locClone.add(0, 1, 0).getBlock();
-        Block block2 = locClone.add(0, 1, 0).getBlock();
+        Block block0 = chunk.getBlock(locClone.getBlockX() & 0xF, locClone.getBlockY() & 0xF, locClone.getBlockZ() & 0xF);
+        Block block1 = chunk.getBlock(locClone.getBlockX() & 0xF, locClone.getBlockY() + 1 & 0xF, locClone.getBlockZ() & 0xF);
+        Block block2 = chunk.getBlock(locClone.getBlockX() & 0xF, locClone.getBlockY() + 2 & 0xF, locClone.getBlockZ() & 0xF);
 
         if (block0 == null || block1 == null || block2 == null) {
             return false;

src/main/resources/config.yml

@@ -1,6 +1,6 @@
 #############################
 #      RandomSpawnPlus5     #
-#       Version 5.0.2       #
+#       Version 5.0.3       #
 #   by @89apt89 & @Dreeam   #
 #############################
 

src/main/resources/lang.yml

@@ -1,6 +1,6 @@
 #############################
 #      RandomSpawnPlus5     #
-#       Version 5.0.2       #
+#       Version 5.0.3       #
 #   by @89apt89 & @Dreeam   #
 #############################