#411 Migrate settings to new structure (work in progress)

- Work in progress: config.yml cannot be loaded after migration
This commit is contained in:
ljacqu
2016-11-22 21:16:56 +01:00
parent 4214c6dc80
commit 254655abdb
9 changed files with 206 additions and 45 deletions
@@ -11,6 +11,7 @@ import fr.xephi.authme.listener.PlayerListener;
import fr.xephi.authme.process.ProcessService;
import fr.xephi.authme.process.SynchronousProcess;
import fr.xephi.authme.service.BungeeService;
import fr.xephi.authme.settings.commandconfig.CommandManager;
import fr.xephi.authme.settings.properties.RegistrationSettings;
import fr.xephi.authme.service.BukkitService;
import fr.xephi.authme.service.TeleportationService;
@@ -49,6 +50,9 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
@Inject
private DataSource dataSource;
@Inject
private CommandManager commandManager;
ProcessSyncPlayerLogin() {
}
@@ -60,16 +64,6 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
}
}
private void forceCommands(Player player) {
for (String command : service.getProperty(RegistrationSettings.FORCE_COMMANDS)) {
player.performCommand(command.replace("%p", player.getName()));
}
for (String command : service.getProperty(RegistrationSettings.FORCE_COMMANDS_AS_CONSOLE)) {
Bukkit.getServer().dispatchCommand(
Bukkit.getServer().getConsoleSender(), command.replace("%p", player.getName()));
}
}
public void processPlayerLogin(Player player) {
final String name = player.getName().toLowerCase();
@@ -124,7 +118,7 @@ public class ProcessSyncPlayerLogin implements SynchronousProcess {
}
// Login is now finished; we can force all commands
forceCommands(player);
commandManager.runCommandsOnLogin(player);
// Send Bungee stuff. The service will check if it is enabled or not.
bungeeService.connectPlayer(player);