Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 432-dependency-injection

Conflicts: src/main/java/fr/xephi/authme/AuthMe.java src/main/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommand.java src/main/java/fr/xephi/authme/hooks/PluginHooks.java src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java src/main/java/fr/xephi/authme/listener/AuthMeServerListener.java src/test/java/fr/xephi/authme/command/executable/authme/RegisterAdminCommandTest.java
2016-05-02 19:48:05 +02:00
parent 9af596327a 20a237dbdf
commit f76a68cb26
9 changed files with 138 additions and 44 deletions
@@ -21,7 +21,7 @@ public class RegisterAdminCommand implements ExecutableCommand {

    @Inject
    private PasswordSecurity passwordSecurity;
-    
+
    @Inject
    private DataSource dataSource;

@@ -65,7 +65,13 @@ public class RegisterAdminCommand implements ExecutableCommand {
                ConsoleLogger.info(sender.getName() + " registered " + playerName);
                Player player = commandService.getPlayer(playerName);
                if (player != null) {
-                    player.kickPlayer("An admin just registered you, please log in again");
+                    final Player p = player;
+                    p.getServer().getScheduler().scheduleSyncDelayedTask(commandService.getAuthMe(), new Runnable() {
+                        @Override
+                        public void run() {
+                            p.kickPlayer("An admin just registered you, please log in again");
+                        }
+                    });
                }
            }
        });