mirror of
https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git
synced 2024-10-31 22:49:21 +00:00
[Bleeding] Fixed startup error due to misconfigured config
This commit is contained in:
parent
d31ad2e9fc
commit
4ef5f59fb9
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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]);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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())
|
||||
{
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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"),
|
||||
|
|
Loading…
Reference in a new issue