Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into commands-refactor

Conflicts: src/main/java/fr/xephi/authme/command/CommandUtils.java src/main/java/fr/xephi/authme/command/executable/captcha/CaptchaCommand.java
2015-12-17 22:32:26 +01:00
parent cbf0996197 21d25e5ad3
commit d871939793
38 changed files with 375 additions and 182 deletions
@@ -57,9 +57,7 @@ public class CaptchaCommand extends ExecutableCommand {
            plugin.cap.remove(playerNameLowerCase);
            String randStr = new RandomString(Settings.captchaLength).nextString();
            plugin.cap.put(playerNameLowerCase, randStr);
-            for (String s : m.retrieve(MessageKey.CAPTCHA_WRONG_ERROR)) {
-                player.sendMessage(s.replace("THE_CAPTCHA", plugin.cap.get(playerNameLowerCase)));
-            }
+            m.send(player, MessageKey.CAPTCHA_WRONG_ERROR, plugin.cap.get(playerNameLowerCase));
            return;
        }