From 0cda9a7698530d5bcb96a02b756805d281af4b75 Mon Sep 17 00:00:00 2001 From: Gabriele C Date: Fri, 8 Apr 2016 14:44:18 +0200 Subject: [PATCH] cleanup --- src/main/java/fr/xephi/authme/AuthMe.java | 1 - .../xephi/authme/command/executable/authme/GetIpCommand.java | 4 ---- src/main/java/fr/xephi/authme/settings/Settings.java | 3 +-- .../fr/xephi/authme/settings/SettingsMigrationService.java | 2 +- .../fr/xephi/authme/settings/properties/HooksSettings.java | 5 ----- src/main/resources/config.yml | 3 --- 6 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 2e7fae7b..c6ce5023 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -316,7 +316,6 @@ public class AuthMe extends JavaPlugin { showSettingsWarnings(); // Sponsor messages - ConsoleLogger.info("AuthMe hooks perfectly with the VeryGames server hosting!"); ConsoleLogger.info("Development builds are available on our jenkins, thanks to f14stelt."); ConsoleLogger.info("Do you want a good game server? Look at our sponsor GameHosting.it leader in Italy as Game Server Provider!"); diff --git a/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java b/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java index 1095b87c..f4f1ee30 100644 --- a/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java +++ b/src/main/java/fr/xephi/authme/command/executable/authme/GetIpCommand.java @@ -25,9 +25,5 @@ public class GetIpCommand implements ExecutableCommand { sender.sendMessage(player.getName() + "'s IP is: " + player.getAddress().getAddress().getHostAddress() + ":" + player.getAddress().getPort()); - if (commandService.getProperty(HooksSettings.ENABLE_VERYGAMES_IP_CHECK)) { - sender.sendMessage(player.getName() + "'s real IP is: " - + Utils.getPlayerIp(player)); - } } } diff --git a/src/main/java/fr/xephi/authme/settings/Settings.java b/src/main/java/fr/xephi/authme/settings/Settings.java index 915c953a..2f470c72 100644 --- a/src/main/java/fr/xephi/authme/settings/Settings.java +++ b/src/main/java/fr/xephi/authme/settings/Settings.java @@ -52,7 +52,7 @@ public final class Settings { banUnsafeIp, sessionExpireOnIpChange, useEssentialsMotd, enableProtection, recallEmail, useWelcomeMessage, broadcastWelcomeMessage, forceRegKick, forceRegLogin, - checkVeryGames, removeJoinMessage, removeLeaveMessage, delayJoinMessage, + removeJoinMessage, removeLeaveMessage, delayJoinMessage, noTeleport, hideTablistBeforeLogin, denyTabcompleteBeforeLogin, kickPlayersBeforeStopping, allowAllCommandsIfRegIsOptional, customAttributes, isRemoveSpeedEnabled, preventOtherCase, keepCollisionsDisabled; @@ -167,7 +167,6 @@ public final class Settings { spawnPriority = load(RestrictionSettings.SPAWN_PRIORITY); getMaxLoginPerIp = load(RestrictionSettings.MAX_LOGIN_PER_IP); getMaxJoinPerIp = load(RestrictionSettings.MAX_JOIN_PER_IP); - checkVeryGames = load(HooksSettings.ENABLE_VERYGAMES_IP_CHECK); removeJoinMessage = load(RegistrationSettings.REMOVE_JOIN_MESSAGE); removeLeaveMessage = load(RegistrationSettings.REMOVE_LEAVE_MESSAGE); delayJoinMessage = load(RegistrationSettings.DELAY_JOIN_MESSAGE); diff --git a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java index a3d70dd1..0982713c 100644 --- a/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java +++ b/src/main/java/fr/xephi/authme/settings/SettingsMigrationService.java @@ -59,7 +59,7 @@ public class SettingsMigrationService { private static boolean hasDeprecatedProperties(FileConfiguration configuration) { String[] deprecatedProperties = { "Converter.Rakamak.newPasswordHash", "Hooks.chestshop", "Hooks.legacyChestshop", "Hooks.notifications", - "Passpartu", "Performances", "settings.restrictions.enablePasswordVerifier", "Xenoforo.predefinedSalt"}; + "Passpartu", "Performances", "settings.restrictions.enablePasswordVerifier", "Xenoforo.predefinedSalt", "VeryGames"}; for (String deprecatedPath : deprecatedProperties) { if (configuration.contains(deprecatedPath)) { return true; diff --git a/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java b/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java index 55e743e4..087bb30d 100644 --- a/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java +++ b/src/main/java/fr/xephi/authme/settings/properties/HooksSettings.java @@ -35,11 +35,6 @@ public class HooksSettings implements SettingsClass { public static final Property CACHE_CUSTOM_ATTRIBUTES = newProperty("Hooks.customAttributes", false); - // TODO REMOVE ME - @Comment("These features are only available on VeryGames Server Provider") - public static final Property ENABLE_VERYGAMES_IP_CHECK = - newProperty("VeryGames.enableIpCheck", false); - @Comment({ "-1 means disabled. If you want that only activated players", "can log into your server, you can set here the group number", diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 5aa33aa7..fd6a9cb0 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -421,6 +421,3 @@ Protection: antiBotSensibility: 5 # Duration in minutes of the antibot automatic system antiBotDuration: 10 -VeryGames: - # These features are only available on VeryGames Server Provider - enableIpCheck: false