Merge branch 'master' into db-improve

Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java

src/main/java/fr/xephi/authme/command/executable/authme/ReloadCommand.java

@@ -5,6 +5,7 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.command.CommandService;
 import fr.xephi.authme.command.ExecutableCommand;
 import fr.xephi.authme.output.MessageKey;
+import fr.xephi.authme.settings.Spawn;
 import org.bukkit.command.CommandSender;
 
 import java.util.List;
@@ -20,7 +21,11 @@ public class ReloadCommand implements ExecutableCommand {
         try {
             commandService.getSettings().reload();
             commandService.reloadMessages(commandService.getSettings().getMessagesFile());
-            plugin.setupDatabase();
+            Spawn.reload();
+            // TODO #432: We should not reload only certain plugin entities but actually reinitialize all elements,
+            // i.e. here in the future we might not have setupDatabase() but Authme.onEnable(), maybe after
+            // a call to some destructor method
+            plugin.setupDatabase(commandService.getSettings());
             commandService.send(sender, MessageKey.CONFIG_RELOAD_SUCCESS);
         } catch (Exception e) {
             sender.sendMessage("Error occurred during reload of AuthMe: aborting");