From 56017c81d0dcd92336cd8c4131796c3df35ead9a Mon Sep 17 00:00:00 2001 From: ljacqu Date: Sun, 22 Jan 2017 13:14:26 +0100 Subject: [PATCH] Minor - don't perform registration settings migration if old path doesn't exist - Migration was otherwise performed if config.yml was blank, which produces confusing output --- .../fr/xephi/authme/settings/SettingsMigrationService.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java index 96a65f75..aac60dde 100644 --- a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java +++ b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java @@ -228,11 +228,12 @@ public class SettingsMigrationService extends PlainMigrationService { } private static boolean convertToRegistrationType(PropertyResource resource) { - if (RegistrationSettings.REGISTRATION_TYPE.isPresent(resource)) { + String oldEmailRegistrationPath = "settings.registration.enableEmailRegistrationSystem"; + if (RegistrationSettings.REGISTRATION_TYPE.isPresent(resource) || !resource.contains(oldEmailRegistrationPath)) { return false; } - boolean useEmail = newProperty("settings.registration.enableEmailRegistrationSystem", false).getValue(resource); + boolean useEmail = newProperty(oldEmailRegistrationPath, false).getValue(resource); RegistrationType registrationType = useEmail ? RegistrationType.EMAIL : RegistrationType.PASSWORD; String useConfirmationPath = useEmail