[Bleeding] Fixed startup error due to misconfigured config

This commit is contained in:
unknown 2014-05-04 23:03:34 +02:00
parent d31ad2e9fc
commit 4ef5f59fb9
24 changed files with 43 additions and 41 deletions

View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Sat Apr 26 13:54:24 CEST 2014 #Sun May 04 23:01:35 CEST 2014
build.number=805 build.number=808

View File

@ -199,8 +199,9 @@ twitterbot:
petprotect_enabled: true petprotect_enabled: true
# Logs Registration # Logs Registration
logs_register_password: '' logs:
logs_register_url: '' url: ''
secret: ''
# Mojang service checker # Mojang service checker
service_checker_url: http://status.mojang.com/check service_checker_url: http://status.mojang.com/check

View File

@ -47,8 +47,8 @@ public class Command_logs extends TFM_Command
public static void updateLogsRegistration(final CommandSender sender, final String targetName, final String targetIP, final LogsRegistrationMode mode) public static void updateLogsRegistration(final CommandSender sender, final String targetName, final String targetIP, final LogsRegistrationMode mode)
{ {
final String logsRegisterURL = TFM_ConfigEntry.LOGS_REGISTER_URL.getString(); final String logsRegisterURL = TFM_ConfigEntry.LOGS_URL.getString();
final String logsRegisterPassword = TFM_ConfigEntry.LOGS_REGISTER_PASSWORD.getString(); final String logsRegisterPassword = TFM_ConfigEntry.LOGS_SECRET.getString();
if (logsRegisterURL == null || logsRegisterPassword == null || logsRegisterURL.isEmpty() || logsRegisterPassword.isEmpty()) if (logsRegisterURL == null || logsRegisterPassword == null || logsRegisterURL.isEmpty() || logsRegisterPassword.isEmpty())
{ {

View File

@ -130,7 +130,8 @@ public class Command_saconfig extends TFM_Command
final Player player = getPlayer(targetName); final Player player = getPlayer(targetName);
if (player != null) { if (player != null)
{
targetName = player.getName(); targetName = player.getName();
} }

View File

@ -22,8 +22,8 @@ public enum TFM_ConfigEntry
MOB_LIMITER_DISABLE_DRAGON(Boolean.class, "moblimiter.disable.dragon"), MOB_LIMITER_DISABLE_DRAGON(Boolean.class, "moblimiter.disable.dragon"),
MOB_LIMITER_DISABLE_GHAST(Boolean.class, "moblimiter.disable.ghast"), MOB_LIMITER_DISABLE_GHAST(Boolean.class, "moblimiter.disable.ghast"),
MOB_LIMITER_DISABLE_GIANT(Boolean.class, "moblimiter.disable.giant"), MOB_LIMITER_DISABLE_GIANT(Boolean.class, "moblimiter.disable.giant"),
MOB_LIMITER_DISABLE_SLIME(Boolean.class, "mob.limiter.disable.slime"), MOB_LIMITER_DISABLE_SLIME(Boolean.class, "moblimiter.disable.slime"),
MOB_LIMITER_ENABLED(Boolean.class, "mob_.limiter.enabled"), MOB_LIMITER_ENABLED(Boolean.class, "moblimiter.enabled"),
MP44_ENABLED(Boolean.class, "mp44_enabled"), MP44_ENABLED(Boolean.class, "mp44_enabled"),
NUKE_MONITOR_ENABLED(Boolean.class, "nukemonitor.enabled"), NUKE_MONITOR_ENABLED(Boolean.class, "nukemonitor.enabled"),
PET_PROTECT_ENABLED(Boolean.class, "petprotect.enabled"), PET_PROTECT_ENABLED(Boolean.class, "petprotect.enabled"),
@ -35,7 +35,7 @@ public enum TFM_ConfigEntry
AUTOKICK_ENABLED(Boolean.class, "autokick.enabled"), AUTOKICK_ENABLED(Boolean.class, "autokick.enabled"),
CONSOLE_IS_SENIOR(Boolean.class, "console_is_senior"), CONSOLE_IS_SENIOR(Boolean.class, "console_is_senior"),
// //
AUTO_PROTECT_RADIUS(Double.class, "autoprotect.auto_protect_radius"), AUTO_PROTECT_RADIUS(Double.class, "protectarea.auto_protect_radius"),
EXPLOSIVE_RADIUS(Double.class, "explosive_radius"), EXPLOSIVE_RADIUS(Double.class, "explosive_radius"),
NUKE_MONITOR_RANGE(Double.class, "nukemonitor.range"), NUKE_MONITOR_RANGE(Double.class, "nukemonitor.range"),
AUTOKICK_THRESHOLD(Double.class, "autokick.threshold"), AUTOKICK_THRESHOLD(Double.class, "autokick.threshold"),
@ -48,8 +48,8 @@ public enum TFM_ConfigEntry
AUTOKICK_TIME(Integer.class, "autokick.time"), AUTOKICK_TIME(Integer.class, "autokick.time"),
// //
FLATLANDS_GENERATE_PARAMS(String.class, "flatlands.generate_params"), FLATLANDS_GENERATE_PARAMS(String.class, "flatlands.generate_params"),
LOGS_REGISTER_PASSWORD(String.class, "logs_register_password"), LOGS_SECRET(String.class, "logs.secret"),
LOGS_REGISTER_URL(String.class, "logs_register_url"), LOGS_URL(String.class, "logs.url"),
SERVICE_CHECKER_URL(String.class, "service_checker_url"), SERVICE_CHECKER_URL(String.class, "service_checker_url"),
TWITTERBOT_SECRET(String.class, "twitterbot.secret"), TWITTERBOT_SECRET(String.class, "twitterbot.secret"),
TWITTERBOT_URL(String.class, "twitterbot.url"), TWITTERBOT_URL(String.class, "twitterbot.url"),