From 4ef5f59fb96336212d7997bba78ea06d0f9a1e27 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 4 May 2014 23:03:34 +0200 Subject: [PATCH] [Bleeding] Fixed startup error due to misconfigured config --- buildnumber.properties | 4 ++-- src/config.yml | 11 ++++++----- .../TotalFreedomMod/Commands/Command_blockcmd.java | 2 +- .../TotalFreedomMod/Commands/Command_cage.java | 2 +- .../TotalFreedomMod/Commands/Command_doom.java | 2 +- .../TotalFreedomMod/Commands/Command_fr.java | 2 +- .../TotalFreedomMod/Commands/Command_gcmd.java | 2 +- .../TotalFreedomMod/Commands/Command_glist.java | 2 +- .../TotalFreedomMod/Commands/Command_gtfo.java | 2 +- .../TotalFreedomMod/Commands/Command_lastcmd.java | 2 +- .../TotalFreedomMod/Commands/Command_lockup.java | 4 ++-- .../TotalFreedomMod/Commands/Command_logs.java | 4 ++-- .../TotalFreedomMod/Commands/Command_orbit.java | 2 +- .../TotalFreedomMod/Commands/Command_premium.java | 2 +- .../TotalFreedomMod/Commands/Command_rank.java | 6 +++--- .../TotalFreedomMod/Commands/Command_saconfig.java | 9 +++++---- .../TotalFreedomMod/Commands/Command_smite.java | 2 +- .../TotalFreedomMod/Commands/Command_stfu.java | 2 +- .../TotalFreedomMod/Commands/Command_survival.java | 2 +- .../TotalFreedomMod/Commands/Command_tag.java | 2 +- .../TotalFreedomMod/Commands/Command_tban.java | 2 +- .../TotalFreedomMod/Commands/Command_tempban.java | 2 +- .../TotalFreedomMod/Commands/Command_whitelist.java | 4 ++-- .../TotalFreedomMod/Config/TFM_ConfigEntry.java | 10 +++++----- 24 files changed, 43 insertions(+), 41 deletions(-) diff --git a/buildnumber.properties b/buildnumber.properties index b689de9b..0247df95 100644 --- a/buildnumber.properties +++ b/buildnumber.properties @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Sat Apr 26 13:54:24 CEST 2014 -build.number=805 +#Sun May 04 23:01:35 CEST 2014 +build.number=808 diff --git a/src/config.yml b/src/config.yml index c034dde5..271882d5 100644 --- a/src/config.yml +++ b/src/config.yml @@ -83,7 +83,7 @@ blocked_commands: - 's:a:/save-off' - 's:a:/clearhistory' - 's:a:/mat' - + # Spigot commands - 's:a:/restart' - 's:b:/setblock' @@ -115,7 +115,7 @@ mp44_enabled: false tossmob_enabled: false # Moblimiter: - + moblimiter: enabled: true max: 50 @@ -194,13 +194,14 @@ twitterbot: enabled: false url: '' secret: '' - + # Pet Protect - Prevent tamed pets from being killed. petprotect_enabled: true # Logs Registration -logs_register_password: '' -logs_register_url: '' +logs: + url: '' + secret: '' # Mojang service checker service_checker_url: http://status.mojang.com/check diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java index a23f8d65..c4f3b598 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java @@ -38,7 +38,7 @@ public class Command_blockcmd extends TFM_Command } final Player player = getPlayer(args[0]); - + if (player == null) { playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java index f1095a42..9ba426bd 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java @@ -49,7 +49,7 @@ public class Command_cage extends TFM_Command } final Player player = getPlayer(args[0]); - + if (player == null) { sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java index 69eb30ba..be55d031 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java @@ -26,7 +26,7 @@ public class Command_doom extends TFM_Command } final Player player = getPlayer(args[0]); - + if (player == null) { sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java index f9a46cdc..55b9feee 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java @@ -82,7 +82,7 @@ public class Command_fr extends TFM_Command else { final Player player = getPlayer(args[0]); - + if (player == null) { playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java index edc9172f..2f5b1b37 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java @@ -20,7 +20,7 @@ public class Command_gcmd extends TFM_Command } final Player player = getPlayer(args[0]); - + if (player == null) { sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java index e688e24f..d92fc670 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java @@ -55,7 +55,7 @@ public class Command_glist extends TFM_Command final Player player = getPlayer(args[1]); - + if (player == null) { final TFM_PlayerEntry entry = TFM_PlayerList.getInstance().getEntry(args[1]); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java index 75925289..eab32cdf 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java @@ -28,7 +28,7 @@ public class Command_gtfo extends TFM_Command } final Player player = getPlayer(args[0]); - + if (player == null) { playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java index 34fa6180..b83b0db5 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java @@ -20,7 +20,7 @@ public class Command_lastcmd extends TFM_Command } final Player player = getPlayer(args[0]); - + if (player == null) { playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java index 507375f1..50db1202 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java @@ -48,7 +48,7 @@ public class Command_lockup extends TFM_Command if (args[1].equalsIgnoreCase("on")) { final Player player = getPlayer(args[0]); - + if (player == null) { sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND); @@ -62,7 +62,7 @@ public class Command_lockup extends TFM_Command else if (TFM_Util.isStopCommand(args[1])) { final Player player = getPlayer(args[0]); - + if (player == null) { sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java index 3f6daa22..20795431 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_logs.java @@ -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) { - final String logsRegisterURL = TFM_ConfigEntry.LOGS_REGISTER_URL.getString(); - final String logsRegisterPassword = TFM_ConfigEntry.LOGS_REGISTER_PASSWORD.getString(); + final String logsRegisterURL = TFM_ConfigEntry.LOGS_URL.getString(); + final String logsRegisterPassword = TFM_ConfigEntry.LOGS_SECRET.getString(); if (logsRegisterURL == null || logsRegisterPassword == null || logsRegisterURL.isEmpty() || logsRegisterPassword.isEmpty()) { diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java index 9fb950d3..0fded76b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java @@ -23,7 +23,7 @@ public class Command_orbit extends TFM_Command } Player player = getPlayer(args[0]); - + if (player == null) { playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java index c3aadf02..d141b2a4 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_premium.java @@ -25,7 +25,7 @@ public class Command_premium extends TFM_Command final Player player = getPlayer(args[0]); final String name; - + if (player != null) { name = player.getName(); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java index edbd70a1..d7121af6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java @@ -35,14 +35,14 @@ public class Command_rank extends TFM_Command } final Player player = getPlayer(args[0]); - + if (player == null) { sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND); return true; } - - + + playerMsg(player.getName() + " is " + TFM_PlayerRank.fromSender(player).getLoginMessage(), ChatColor.AQUA); return true; diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java index 0a08bc25..9b8dfadb 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java @@ -97,7 +97,7 @@ public class Command_saconfig extends TFM_Command player = getPlayer(args[1]); - + if (player == null) { final TFM_Admin superadmin = TFM_AdminList.getEntry(args[1]); @@ -129,11 +129,12 @@ public class Command_saconfig extends TFM_Command final Player player = getPlayer(targetName); - - if (player != null) { + + if (player != null) + { targetName = player.getName(); } - + if (!TFM_AdminList.getLowerSuperNames().contains(targetName.toLowerCase())) { playerMsg("Superadmin not found: " + targetName); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java index 0d011e52..d891fa0b 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java @@ -23,7 +23,7 @@ public class Command_smite extends TFM_Command } final Player player = getPlayer(args[0]); - + if (player == null) { playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java index 237c871b..787a60ab 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java @@ -99,7 +99,7 @@ public class Command_stfu extends TFM_Command else { final Player player = getPlayer(args[0]); - + if (player == null) { sender.sendMessage(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java index a75294b0..6d05c0f1 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java @@ -52,7 +52,7 @@ public class Command_survival extends TFM_Command if (senderIsConsole || TFM_AdminList.isSuperAdmin(sender)) { player = getPlayer(args[0]); - + if (player == null) { playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java index d2ea0a03..b26a8dda 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tag.java @@ -105,7 +105,7 @@ public class Command_tag extends TFM_Command } final Player player = getPlayer(args[1]); - + if (player == null) { playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java index a448e141..b2c4577c 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tban.java @@ -24,7 +24,7 @@ public class Command_tban extends TFM_Command } final Player player = getPlayer(args[0]); - + if (player == null) { playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND, ChatColor.RED); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java index 1287af56..bbe89ce6 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java @@ -28,7 +28,7 @@ public class Command_tempban extends TFM_Command } final Player player = getPlayer(args[0]); - + if (player == null) { playerMsg(TotalFreedomMod.PLAYER_NOT_FOUND); diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java index 3a96a6a4..b98b2220 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java @@ -89,7 +89,7 @@ public class Command_whitelist extends TFM_Command String search_name = args[1].trim().toLowerCase(); OfflinePlayer player = getPlayer(search_name); - + if (player == null) { player = server.getOfflinePlayer(search_name); @@ -111,7 +111,7 @@ public class Command_whitelist extends TFM_Command String search_name = args[1].trim().toLowerCase(); OfflinePlayer player = getPlayer(search_name); - + if (player == null) { player = server.getOfflinePlayer(search_name); diff --git a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java index f7e685dc..5340dbb9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java +++ b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java @@ -22,8 +22,8 @@ public enum TFM_ConfigEntry MOB_LIMITER_DISABLE_DRAGON(Boolean.class, "moblimiter.disable.dragon"), MOB_LIMITER_DISABLE_GHAST(Boolean.class, "moblimiter.disable.ghast"), MOB_LIMITER_DISABLE_GIANT(Boolean.class, "moblimiter.disable.giant"), - MOB_LIMITER_DISABLE_SLIME(Boolean.class, "mob.limiter.disable.slime"), - MOB_LIMITER_ENABLED(Boolean.class, "mob_.limiter.enabled"), + MOB_LIMITER_DISABLE_SLIME(Boolean.class, "moblimiter.disable.slime"), + MOB_LIMITER_ENABLED(Boolean.class, "moblimiter.enabled"), MP44_ENABLED(Boolean.class, "mp44_enabled"), NUKE_MONITOR_ENABLED(Boolean.class, "nukemonitor.enabled"), PET_PROTECT_ENABLED(Boolean.class, "petprotect.enabled"), @@ -35,7 +35,7 @@ public enum TFM_ConfigEntry AUTOKICK_ENABLED(Boolean.class, "autokick.enabled"), 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"), NUKE_MONITOR_RANGE(Double.class, "nukemonitor.range"), AUTOKICK_THRESHOLD(Double.class, "autokick.threshold"), @@ -48,8 +48,8 @@ public enum TFM_ConfigEntry AUTOKICK_TIME(Integer.class, "autokick.time"), // FLATLANDS_GENERATE_PARAMS(String.class, "flatlands.generate_params"), - LOGS_REGISTER_PASSWORD(String.class, "logs_register_password"), - LOGS_REGISTER_URL(String.class, "logs_register_url"), + LOGS_SECRET(String.class, "logs.secret"), + LOGS_URL(String.class, "logs.url"), SERVICE_CHECKER_URL(String.class, "service_checker_url"), TWITTERBOT_SECRET(String.class, "twitterbot.secret"), TWITTERBOT_URL(String.class, "twitterbot.url"),