Merge origin/master

Conflicts:
	setspawn/SetSpawn.java

plugin.yml

@@ -1,7 +1,7 @@
 name: SetSpawn
-version: 3.0.2
+version: 3.0.5
 main: setspawn.SetSpawn
-description: Set the spawn!
+description: Set the spawn
 
 commands:
     setspawn:
@@ -10,9 +10,6 @@ commands:
     spawn:
         usage: /<command>
         description: Go to the spawn!
-    ssreload:
-        usage: /<command>
-        description: Reload the config!
 
 permissions:
     spawn.set:
@@ -23,4 +20,4 @@ permissions:
         default: op
     spawn.spawn:
         description: Use the spawn command.
-        default: op
+        default: op

setspawn/SetSpawn.java

@@ -37,7 +37,7 @@ public class SetSpawn extends JavaPlugin implements Listener {
 
     @Override
     public void onDisable() {
-        getLogger().info("Spawn has been disabled!");
+        //getLogger().info("Spawn has been disabled!");
     }
 
     @Override
@@ -102,11 +102,13 @@ public class SetSpawn extends JavaPlugin implements Listener {
     @EventHandler
     public void onJoin(PlayerJoinEvent e) {
         final Player p = e.getPlayer();
+      
+        if (getConfig().getConfigurationSection("spawn") == null) {
+           p.sendMessage(ChatColor.translateAlternateColorCodes('&', getConfig().getString("No-Spawn-Message")));
+          return;
+        }
+        
         if (getConfig().getBoolean("On-Join-Spawn") || (getConfig().getBoolean("On-First-Spawn") && !e.getPlayer().hasPlayedBefore())) {
-            if (getConfig().getConfigurationSection("spawn") == null) {
-                p.sendMessage(ChatColor.translateAlternateColorCodes('&', getConfig().getString("No-Spawn-Message")));
-                return;
-            }
             new BukkitRunnable() {
                 public void run() {
                     World w = Bukkit.getServer().getWorld(getConfig().getString("spawn.world"));