B38 release

src/main/java/fr/xephi/authme/AuthMe.java

@@ -74,7 +74,7 @@ public class AuthMe extends JavaPlugin {
     // Version and build number values
     private static String pluginVersion = "5.6.0-Fork";
     public static final String pluginBuild = "b";
-    private static String pluginBuildNumber = "36";
+    private static String pluginBuildNumber = "38";
     // Private instances
     private EmailService emailService;
     private CommandHandler commandHandler;

src/main/java/fr/xephi/authme/service/TeleportationService.java

@@ -142,7 +142,7 @@ public class TeleportationService implements Reloadable {
             logger.debug("Teleporting `{0}` to spawn because of 'force-spawn after login'", player.getName());
             teleportToSpawn(player, true);
         } else if (settings.getProperty(TELEPORT_UNAUTHED_TO_SPAWN)) {
-            if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION)) {
+            if (settings.getProperty(RestrictionSettings.SAVE_QUIT_LOCATION) && auth.getQuitLocY() != 0) {
                 Location location = buildLocationFromAuth(player, auth);
                 logger.debug("Teleporting `{0}` after login, based on the player auth", player.getName());
                 teleportBackFromSpawn(player, location);

src/main/java/fr/xephi/authme/settings/properties/PluginSettings.java

@@ -39,7 +39,7 @@ public final class PluginSettings implements SettingsHolder {
         "https://github.com/AuthMe/AuthMeReloaded/blob/master/docs/translations.md"
     })
     public static final Property<String> MESSAGES_LANGUAGE =
-        newProperty("settings.messagesLanguage", "zhcn");
+        newProperty("settings.messagesLanguage", "en");
 
     @Comment({
         "Enables switching a player to defined permission groups before they log in.",

src/main/java/fr/xephi/authme/settings/properties/ProtectionSettings.java

@@ -14,11 +14,11 @@ public final class ProtectionSettings implements SettingsHolder {
 
     @Comment("Enable some servers protection (country based login, antibot)")
     public static final Property<Boolean> ENABLE_PROTECTION =
-        newProperty("Protection.enableProtection", true);
+        newProperty("Protection.enableProtection", false);
 
     @Comment("Apply the protection also to registered usernames")
     public static final Property<Boolean> ENABLE_PROTECTION_REGISTERED =
-        newProperty("Protection.enableProtectionRegistered", true);
+        newProperty("Protection.enableProtectionRegistered", false);
 
     @Comment({
         "Countries allowed to join the server and register. For country codes, see",
@@ -26,7 +26,7 @@ public final class ProtectionSettings implements SettingsHolder {
         "Use \"LOCALHOST\" for local addresses.",
         "PLEASE USE QUOTES!"})
     public static final Property<List<String>> COUNTRIES_WHITELIST =
-        newListProperty("Protection.countries", "CN", "LOCALHOST");
+        newListProperty("Protection.countries", "LOCALHOST");
 
     @Comment({
         "Countries not allowed to join the server and register",

src/main/java/fr/xephi/authme/settings/properties/SecuritySettings.java

@@ -28,52 +28,47 @@ public final class SecuritySettings implements SettingsHolder {
 
     @Comment({"Should we let Bedrock players login automatically?",
         "(Requires hookFloodgate to be true & floodgate loaded)"})
-    public static final Property<Boolean> FORCE_LOGIN_BEDROCK = newProperty("3rdPartyFeature.features.bedrockAutoLogin", false);
+    public static final Property<Boolean> FORCE_LOGIN_BEDROCK =
+        newProperty("3rdPartyFeature.features.bedrockAutoLogin", false);
 
     @Comment("Enable the new feature to prevent ghost players?")
-    public static final Property<Boolean> ANTI_GHOST_PLAYERS = newProperty("3rdPartyFeature.fixes.antiGhostPlayer", false);
+    public static final Property<Boolean> ANTI_GHOST_PLAYERS =
+        newProperty("3rdPartyFeature.fixes.antiGhostPlayer", false);
 
     @Comment({"Choose the best teleport method by server brand?",
         "(Enable this if you are using Paper)"})
-    public static final Property<Boolean> SMART_ASYNC_TELEPORT = newProperty("3rdPartyFeature.optimizes.smartAsyncTeleport", false);
+    public static final Property<Boolean> SMART_ASYNC_TELEPORT =
+        newProperty("3rdPartyFeature.optimizes.smartAsyncTeleport", false);
 
     @Comment("Send a GUI captcha to unregistered players?(Requires ProtocolLib)")
-    public static final Property<Boolean> GUI_CAPTCHA = newProperty("3rdPartyFeature.features.captcha.guiCaptcha", false);
+    public static final Property<Boolean> GUI_CAPTCHA =
+        newProperty("3rdPartyFeature.features.captcha.guiCaptcha", false);
 
     @Comment({"Should we kick the players when they don't finish the GUI captcha in seconds?",
         "(less than or equals 0 is disabled)"})
-    public static final Property<Integer> GUI_CAPTCHA_TIMEOUT = newProperty("3rdPartyFeature.features.captcha.timeOut", 0);
+    public static final Property<Integer> GUI_CAPTCHA_TIMEOUT =
+        newProperty("3rdPartyFeature.features.captcha.timeOut", 0);
 
     @Comment({"Should we ignore floodgate players when sending GUI captcha?",
         "(Requires floodgate and hookFloodgate: true)"})
-    public static final Property<Boolean> GUI_CAPTCHA_BE_COMPATIBILITY = newProperty("3rdPartyFeature.features.captcha.ignoreBedrock", false);
+    public static final Property<Boolean> GUI_CAPTCHA_BE_COMPATIBILITY =
+        newProperty("3rdPartyFeature.features.captcha.ignoreBedrock", false);
 
     @Comment("Should we delete player data and stats when they didn't finish the captcha?")
-    public static final Property<Boolean> DELETE_UNVERIFIED_PLAYER_DATA = newProperty("3rdPartyFeature.features.captcha.purgePlayerData", false);
+    public static final Property<Boolean> DELETE_UNVERIFIED_PLAYER_DATA =
+        newProperty("3rdPartyFeature.features.captcha.purgePlayerData", false);
 
     @Comment("Which world's player data should be deleted?(Enter the world *FOLDER* name where your players first logged in)")
-    public static final Property<String> DELETE_PLAYER_DATA_WORLD = newProperty("3rdPartyFeature.features.captcha.purgeWorldFolderName", "world");
+    public static final Property<String> DELETE_PLAYER_DATA_WORLD =
+        newProperty("3rdPartyFeature.features.captcha.purgeWorldFolderName", "world");
 
     @Comment("Should we fix the location when players logged in the portal?")
-    public static final Property<Boolean> LOGIN_LOC_FIX_SUB_PORTAL = newProperty("3rdPartyFeature.fixes.loginLocationFix.fixPortalStuck", false);
+    public static final Property<Boolean> LOGIN_LOC_FIX_SUB_PORTAL =
+        newProperty("3rdPartyFeature.fixes.loginLocationFix.fixPortalStuck", false);
 
     @Comment("Should we fix the location when players logged underground?")
-    public static final Property<Boolean> LOGIN_LOC_FIX_SUB_UNDERGROUND = newProperty("3rdPartyFeature.fixes.loginLocationFix.fixGroundStuck", false);
-
-//    @Comment({"Should we kick the players when they failed captcha too many times?",
-//    "(Minimum value is 1)(Default: 3)"})
-//    public static final Property<Integer> GUI_CAPTCHA_MAX_TRY = newProperty("3rdPartyFeature.captcha.maxTryTimes",3);
-
-
-    //@Comment({"Using which API to get hash data?",
-        //"Available options: github, gitee, ghproxy (if your server is in China, please use gitee or ghproxy.)"})
-    //public static final Property<String> SHA_CHECK_METHOD = newProperty("Plugin.hashing.hashApi","github");
-
-    //@Comment("Should we use the local cache sometimes instead of requesting API?")
-    //public static  final Property<Boolean> USE_LOCAL_CACHE = newProperty("Plugin.hashing.useLocalCache",false);
-
-    //@Comment("DON'T TOUCH!!!")
-    //public static final Property<String> SHA_CHECK_CACHE = newProperty("Plugin.hashing.hashCached","");
+    public static final Property<Boolean> LOGIN_LOC_FIX_SUB_UNDERGROUND =
+        newProperty("3rdPartyFeature.fixes.loginLocationFix.fixGroundStuck", false);
 
     @Comment("Copy AuthMe log output in a separate file as well?")
     public static final Property<Boolean> USE_LOGGING =

src/main/resources/messages/messages_zhcn.yml

@@ -11,6 +11,7 @@ registration:
     command_usage: '&c正确用法:“/reg <密码> <重复密码>”'
     reg_only: '&c只允许注册过的玩家进服!'
     success: '&a*** 已成功注册 ***'
+    kicked_admin_registered: '&a*** 管理员刚刚注册了您; 请重新登录 ***'
 
 # Password errors on registration
 password:

src/main/resources/plugin.yml

@@ -3,7 +3,7 @@ authors: [${pluginDescription.authors}]
 website: http://github.com/HaHaWTH/AuthMeReReloaded/
 description: A fork of AuthMeReloaded that contains bug fixes
 main: ${pluginDescription.main}
-version: 5.6.0-FORK-b36
+version: 5.6.0-FORK-b38
 api-version: 1.13
 softdepend:
     - Vault