Merge branch 'master' into 745-captcha-login-message

src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java

@@ -16,7 +16,7 @@ import fr.xephi.authme.permission.PermissionsManager;
 import fr.xephi.authme.permission.PlayerPermission;
 import fr.xephi.authme.permission.PlayerStatePermission;
 import fr.xephi.authme.process.AsynchronousProcess;
-import fr.xephi.authme.process.ProcessService;
+import fr.xephi.authme.service.CommonService;
 import fr.xephi.authme.process.SyncProcessManager;
 import fr.xephi.authme.security.PasswordSecurity;
 import fr.xephi.authme.settings.properties.DatabaseSettings;
@@ -44,7 +44,7 @@ public class AsynchronousLogin implements AsynchronousProcess {
     private DataSource dataSource;
 
     @Inject
-    private ProcessService service;
+    private CommonService service;
 
     @Inject
     private PermissionsManager permissionsManager;
@@ -224,7 +224,11 @@ public class AsynchronousLogin implements AsynchronousProcess {
             player.setNoDamageTicks(0);
 
             service.send(player, MessageKey.LOGIN_SUCCESS);
-            displayOtherAccounts(auth, player);
+
+            // Other auths
+            List<String> auths = dataSource.getAllAuthsByIp(auth.getIp());
+            runCommandOtherAccounts(auths, player, auth.getIp());
+            displayOtherAccounts(auths, player);
 
             final String email = auth.getEmail();
             if (service.getProperty(EmailSettings.RECALL_PLAYERS)
@@ -252,12 +256,29 @@ public class AsynchronousLogin implements AsynchronousProcess {
         }
     }
 
-    private void displayOtherAccounts(PlayerAuth auth, Player player) {
-        if (!service.getProperty(RestrictionSettings.DISPLAY_OTHER_ACCOUNTS) || auth == null) {
+    private void runCommandOtherAccounts(List<String> auths, Player player, String ip) {
+        int threshold = service.getProperty(RestrictionSettings.OTHER_ACCOUNTS_CMD_THRESHOLD);
+        String command = service.getProperty(RestrictionSettings.OTHER_ACCOUNTS_CMD);
+
+        if(threshold < 2 || command.isEmpty()) {
+            return;
+        }
+
+        if (auths.size() < threshold) {
+            return;
+        }
+
+        bukkitService.dispatchConsoleCommand(command
+            .replaceAll("%playername%", player.getName())
+            .replaceAll("%playerip%", ip)
+        );
+    }
+
+    private void displayOtherAccounts(List<String> auths, Player player) {
+        if (!service.getProperty(RestrictionSettings.DISPLAY_OTHER_ACCOUNTS)) {
             return;
         }
 
-        List<String> auths = dataSource.getAllAuthsByIp(auth.getIp());
         if (auths.size() <= 1) {
             return;
         }