Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1467-message-keys-hierarchy

Conflicts:
	src/main/resources/messages/messages_ko.yml

src/main/java/fr/xephi/authme/settings/SettingsWarner.java

@@ -5,9 +5,12 @@ import fr.xephi.authme.ConsoleLogger;
 import fr.xephi.authme.security.HashAlgorithm;
 import fr.xephi.authme.security.crypts.Argon2;
 import fr.xephi.authme.settings.properties.EmailSettings;
+import fr.xephi.authme.settings.properties.HooksSettings;
 import fr.xephi.authme.settings.properties.PluginSettings;
 import fr.xephi.authme.settings.properties.RestrictionSettings;
 import fr.xephi.authme.settings.properties.SecuritySettings;
+import fr.xephi.authme.util.Utils;
+import org.bukkit.Bukkit;
 
 import javax.inject.Inject;
 
@@ -50,6 +53,14 @@ public class SettingsWarner {
             ConsoleLogger.warning("Warning: Session timeout needs to be positive in order to work!");
         }
 
+        // Warn if spigot.yml has settings.bungeecord set to true but config.yml has Hooks.bungeecord set to false
+        if (Utils.isSpigot() && Bukkit.spigot().getConfig().getBoolean("settings.bungeecord")
+            && !settings.getProperty(HooksSettings.BUNGEECORD)) {
+            ConsoleLogger.warning("Note: Hooks.bungeecord is set to false but your server appears to be running in" +
+                " bungeecord mode (see your spigot.yml). In order to allow the datasource caching and the AuthMeBungee" +
+                " add-on to work properly you have to enable this option!");
+        }
+
         // Check if argon2 library is present and can be loaded
         if (settings.getProperty(SecuritySettings.PASSWORD_HASH).equals(HashAlgorithm.ARGON2)
             && !Argon2.isLibraryLoaded()) {

src/main/java/fr/xephi/authme/util/Utils.java

@@ -22,6 +22,20 @@ public final class Utils {
     private Utils() {
     }
 
+    /**
+     * Returns if the running server instance is craftbukkit or spigot based.
+     *
+     * @return true if the running server instance is spigot-based.
+     */
+    public static boolean isSpigot() {
+        try {
+            Class.forName("org.spigotmc.SpigotConfig");
+        } catch (ClassNotFoundException e) {
+            return false;
+        }
+        return true;
+    }
+
     /**
      * Compile Pattern sneaky without throwing Exception.
      *

src/main/resources/messages/messages_ko.yml

@@ -1,4 +1,4 @@
-#Translated by Kirito (kds123321@naver.com), System32(me@syst32.com)
+#Translated by Kirito (kds123321@naver.com), System32(me@syst32.com), Adeuran(adeuran@tistory.com)
 #14.05.2017 Thanks for use
 
 # Registration
@@ -114,8 +114,8 @@ captcha:
     usage_captcha: '&3로그인 하려면 CAPTCHA 코드를 입력해야 합니다. 이 명령어를 사용하세요: /captcha %captcha_code'
     wrong_captcha: '&c잘못된 CAPTCHA 코드 입니다. "/captcha %captcha_code" 형태로 입력해주세요!'
     valid_captcha: '&2CAPTCHA 코드가 확인되었습니다!'
-    # TODO captcha_for_registration: 'To register you have to solve a captcha first, please use the command: /captcha %captcha_code'
+    captcha_for_registration: '회원가입을 하기 위해서는 먼저 CAPTCHA 코드를 입력해야합니다. 이 명령어를 이 명령어를 사용하세요: /captcha %captcha_code'
-    # TODO register_captcha_valid: '&2Valid captcha! You may now register with /register'
+    register_captcha_valid: '&2올바른 CAPTCHA 코드입니다! 이제 /register 명령어를 이용하여 회원가입할 수 있습니다.'
 
 # Verification code
 verification: