Merge remote-tracking branch 'origin/master' into jsoncache-fix

Conflicts:
	src/main/java/fr/xephi/authme/settings/Settings.java

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

@@ -19,15 +19,15 @@ public final class Settings {
     public static boolean isPermissionCheckEnabled;
     public static boolean isTeleportToSpawnEnabled;
     public static boolean isAllowRestrictedIp;
+    public static boolean isSaveQuitLocationEnabled;
+    public static boolean protectInventoryBeforeLogInEnabled;
     public static boolean isStopEnabled;
     public static boolean reloadSupport;
     public static boolean noTeleport;
-    public static boolean isRemoveSpeedEnabled;
     public static String getUnloggedinGroup;
     public static String unRegisteredGroup;
     public static String getRegisteredGroup;
     public static String defaultWorld;
-    public static String crazyloginFileName;
     public static int getNonActivatedGroup;
     private static FileConfiguration configFile;
 
@@ -45,6 +45,7 @@ public final class Settings {
         isPermissionCheckEnabled = load(PluginSettings.ENABLE_PERMISSION_CHECK);
         isTeleportToSpawnEnabled = load(RestrictionSettings.TELEPORT_UNAUTHED_TO_SPAWN);
         isAllowRestrictedIp = load(RestrictionSettings.ENABLE_RESTRICTED_USERS);
+        isSaveQuitLocationEnabled = load(RestrictionSettings.SAVE_QUIT_LOCATION);
         isRemoveSpeedEnabled = load(RestrictionSettings.REMOVE_SPEED);
         getUnloggedinGroup = load(SecuritySettings.UNLOGGEDIN_GROUP);
         getNonActivatedGroup = configFile.getInt("ExternalBoardOptions.nonActivedUserGroup", -1);
@@ -55,7 +56,6 @@ public final class Settings {
         reloadSupport = configFile.getBoolean("Security.ReloadCommand.useReloadCommandSupport", true);
         defaultWorld = configFile.getString("Purge.defaultWorld", "world");
         noTeleport = load(RestrictionSettings.NO_TELEPORT);
-        crazyloginFileName = configFile.getString("Converter.CrazyLogin.fileName", "accounts.db");
     }
 
     /**

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

@@ -92,10 +92,10 @@ public class SettingsMigrationService {
 
         final File emailFile = new File(pluginFolder, "email.html");
         final String mailText = configuration.getString(oldSettingPath)
-            .replace("<playername>", "<playername />")
-            .replace("<servername>", "<servername />")
-            .replace("<generatedpass>", "<generatedpass />")
-            .replace("<image>", "<image />");
+            .replace("<playername>", "<playername />").replace("%playername%", "<playername />")
+            .replace("<servername>", "<servername />").replace("%servername%", "<servername />")
+            .replace("<generatedpass>", "<generatedpass />").replace("%generatedpass%", "<generatedpass />")
+            .replace("<image>", "<image />").replace("%image%", "<image />");
         if (!emailFile.exists()) {
             try (FileWriter fw = new FileWriter(emailFile)) {
                 fw.write(mailText);

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

@@ -25,7 +25,6 @@ public class PluginSettings implements SettingsClass {
 
     @Comment({
         "After how many minutes should a session expire?",
-        "0 for unlimited time (Very dangerous, use it at your own risk!)",
         "Remember that sessions will end only after the timeout, and",
         "if the player's IP has changed but the timeout hasn't expired,",
         "the player will be kicked from the server due to invalid session"

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

@@ -141,10 +141,6 @@ public class RestrictionSettings implements SettingsClass {
     public static final Property<Boolean> DENY_TABCOMPLETE_BEFORE_LOGIN =
         newProperty("settings.restrictions.DenyTabCompleteBeforeLogin", true);
 
-    @Comment("Should we hide the tablist before logging in? Requires ProtocolLib.")
-    public static final Property<Boolean> HIDE_TABLIST_BEFORE_LOGIN =
-        newProperty("settings.restrictions.HideTablistBeforeLogin", true);
-
     @Comment({
         "Should we display all other accounts from a player when he joins?",
         "permission: /authme.admin.accounts"})