Merge pull request #9 from kadenscott/3.3.3

3.3.3

Author: Kaden S

.gitignore

@@ -1,4 +1,5 @@
 # Project exclude paths
 /target/
 
-.idea
+.idea
+*.iml

RandomSpawnPlus3.iml

@@ -50,12 +50,5 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.ess3:FlattenedProvider:2.17.0" level="project" />
     <orderEntry type="library" name="Maven: co.aikar:acf-PAPER:0.5.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: co.aikar:acf-bukkit:0.5.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: co.aikar:acf-core:0.5.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: co.aikar:Table:1.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: co.aikar:DelegatingMap:1.0.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: co.aikar:locales:1.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: net.jodah:expiringmap:0.5.8" level="project" />
-    <orderEntry type="library" name="Maven: co.aikar:minecraft-timings:1.0.4" level="project" />
-    <orderEntry type="library" name="Maven: org.jetbrains:annotations:13.0" level="project" />
   </component>
 </module>

pom.xml

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

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

@@ -5,7 +5,6 @@
 import net.ess3.api.IEssentials;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.jetbrains.annotations.NotNull;
 import systems.kscott.randomspawnplus3.commands.CommandRSP;
 import systems.kscott.randomspawnplus3.commands.CommandWild;
 import systems.kscott.randomspawnplus3.listeners.RSPDeathListener;
@@ -75,7 +74,6 @@ public IEssentials getEssentials() {
         return (IEssentials) getServer().getPluginManager().getPlugin("Essentials");
     }
 
-    @NotNull
     public FileConfiguration getConfig() {
         return configManager.getConfig();
     }

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

@@ -1,18 +1,15 @@
 package systems.kscott.randomspawnplus3.commands;
 
 import co.aikar.commands.BaseCommand;
-import co.aikar.commands.BukkitCommandContexts;
 import co.aikar.commands.annotation.*;
 import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import systems.kscott.randomspawnplus3.RandomSpawnPlus;
 import systems.kscott.randomspawnplus3.events.RandomSpawnEvent;
-import systems.kscott.randomspawnplus3.events.SpawnCheckEvent;
 import systems.kscott.randomspawnplus3.events.SpawnType;
 import systems.kscott.randomspawnplus3.exceptions.FinderTimedOutException;
 import systems.kscott.randomspawnplus3.exceptions.NoCooldownException;
@@ -21,11 +18,11 @@
 import systems.kscott.randomspawnplus3.util.CooldownManager;
 
 import java.time.Instant;
-import java.util.HashMap;
 import java.util.Objects;
 
 @CommandAlias("wild|rtp")
 @Description("Teleport to a random location")
+@CommandPermission("randomspawnplus.wild")
 public class CommandWild extends BaseCommand {
 
     private RandomSpawnPlus plugin;

src/main/java/systems/kscott/randomspawnplus3/events/RandomSpawnEvent.java

@@ -5,7 +5,6 @@
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
 
 public class RandomSpawnEvent extends Event {
 
@@ -22,7 +21,6 @@ public class RandomSpawnEvent extends Event {
     private static final HandlerList HANDLERS_LIST = new HandlerList();
 
 
-    @NotNull
     @Override
     public HandlerList getHandlers() {
         return HANDLERS_LIST;

src/main/java/systems/kscott/randomspawnplus3/events/SpawnCheckEvent.java

@@ -4,7 +4,6 @@
 import org.bukkit.Location;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
-import org.jetbrains.annotations.NotNull;
 
 public class SpawnCheckEvent extends Event {
 
@@ -29,7 +28,6 @@ public SpawnCheckEvent(Location location) {
         this.valid = true;
     }
 
-    @NotNull
     @Override
     public HandlerList getHandlers() {
         return HANDLERS_LIST;