Merge pull request #21 from kadenscott/dev

Fix NPE when checking block info of unloaded chunk

Author: Kaden S

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>systems.kscott</groupId>
     <artifactId>randomspawnplus</artifactId>
-    <version>3.4.1</version>
+    <version>3.4.3</version>
     <packaging>jar</packaging>
 
     <name>RandomSpawnPlus</name>
@@ -29,22 +29,6 @@
                     <target>${java.version}</target>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.1.0</version>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                        <configuration>
-                            <createDependencyReducedPom>false</createDependencyReducedPom>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -64,6 +48,7 @@
                         <goals>
                             <goal>shade</goal>
                         </goals>
+
                     </execution>
                 </executions>
             </plugin>
@@ -135,12 +120,6 @@
             <artifactId>acf-PAPER</artifactId>
             <version>0.5.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>1.18.12</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>io.papermc</groupId>
             <artifactId>paperlib</artifactId>

src/main/java/systems/kscott/randomspawnplus3/RandomSpawnPlus.java

@@ -5,6 +5,7 @@
 import net.ess3.api.IEssentials;
 import net.luckperms.api.LuckPerms;
 import net.milkbowl.vault.economy.Economy;
+import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.RegisteredServiceProvider;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -31,10 +32,10 @@ public final class RandomSpawnPlus extends JavaPlugin {
     private ConfigFile spawnsManager;
 
     @Getter
-    private LuckPerms permissions;
+    private Economy economy;
 
     @Getter
-    private Economy economy;
+    private LuckPerms luckPerms;
 
     @Override
     public void onEnable() {
@@ -118,16 +119,16 @@ public FileConfiguration getSpawns() {
         return spawnsManager.getConfig();
     }
 
-    private void setupPermissions() throws Exception {
+    private void setupPermissions() {
         RegisteredServiceProvider<LuckPerms> rsp = getServer().getServicesManager().getRegistration(LuckPerms.class);
         if (rsp == null) {
-            throw new Exception("Error when loading the LuckPerms API");
+            luckPerms = null;
         }
-        permissions = rsp.getProvider();
+        luckPerms = rsp.getProvider();
     }
 
     private void setupEconomy() throws Exception {
-        RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
+        RegisteredServiceProvider<Economy> rsp = Bukkit.getServicesManager().getRegistration(Economy.class);
         if (rsp == null) {
             throw new Exception("Error when loading the Vault API");
         }

src/main/java/systems/kscott/randomspawnplus3/commands/CommandWild.java

@@ -96,13 +96,6 @@ public void wild(CommandSender sender) {
             }
         }
 
-        if (config.getBoolean("remove-permission-on-first-use")) {
-            LuckPerms luckPerms = plugin.getPermissions();
-            luckPerms.getUserManager().getUser(player.getUniqueId()).data().add(Node.builder("randomspawnplus.wild").value(false).build());
-            luckPerms.getUserManager().savePlayerData(player.getUniqueId(), player.getName());
-        }
-
-
         RandomSpawnEvent randomSpawnEvent = new RandomSpawnEvent(location, player, SpawnType.WILD_COMMAND);
 
         Bukkit.getServer().getPluginManager().callEvent(randomSpawnEvent);

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

@@ -40,7 +40,7 @@ public SpawnFinder(RandomSpawnPlus plugin) {
         this.config = plugin.getConfig();
 
         /* Setup safeblocks */
-        List<String> safeBlockStrings = new ArrayList<>();
+        List<String> safeBlockStrings;
         safeBlockStrings = config.getStringList("safe-blocks");
 
         safeBlocks = new ArrayList<>();
@@ -149,6 +149,10 @@ public Location findSpawn(boolean useSpawnCaching) throws FinderTimedOutExceptio
     }
 
     public boolean checkSpawn(Location location) {
+        if (location == null) {
+            return false;
+        }
+
         boolean blockWaterSpawns = config.getBoolean("block-water-spawns");
         boolean blockLavaSpawns = config.getBoolean("block-lava-spawns");
         boolean debugMode = config.getBoolean("debug-mode");
@@ -159,15 +163,25 @@ public boolean checkSpawn(Location location) {
         int blockedMaxZ = config.getInt("blocked-spawns-zone.max-z");
         int blockedMinZ = config.getInt("blocked-spawns-zone.min-z");
 
-
         boolean isValid;
 
         Location locClone = location.clone();
 
+        if (locClone == null) {
+            return false;
+        }
+        if (!location.isChunkLoaded()) {
+            location.getChunk().load();
+        }
+
         Block block0 = locClone.getBlock();
         Block block1 = locClone.add(0, 1, 0).getBlock();
         Block block2 = locClone.add(0, 1, 0).getBlock();
 
+        if (block0 == null || block1 == null || block2 == null) {
+            return false;
+        }
+
         SpawnCheckEvent spawnCheckEvent = new SpawnCheckEvent(location);
 
         Bukkit.getServer().getPluginManager().callEvent(spawnCheckEvent);

src/main/resources/plugin.yml

@@ -2,7 +2,7 @@ name: RandomSpawnPlus
 version: ${project.version}
 main: systems.kscott.randomspawnplus3.RandomSpawnPlus
 api-version: 1.13
-softdepend: [Essentials, Factions, Vault]
+softdepend: [Essentials, Factions, Vault, LuckPerms]
 authors: [89apt89]
 description: A comprehensive random spawning plugin for modern Minecraft versions.
 load: POSTWORLD