diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java index 58121385..abe02fe3 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java @@ -8,7 +8,7 @@ import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -@CommandPermissions(level = ADMIN_LEVEL.SENIOR, source = SOURCE_TYPE_ALLOWED.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) +@CommandPermissions(level = ADMIN_LEVEL.SUPER, source = SOURCE_TYPE_ALLOWED.BOTH, block_host_console = true, ignore_permissions = false) public class Command_permban extends TFM_Command { @Override @@ -25,6 +25,11 @@ public class Command_permban extends TFM_Command } else if (args[0].equalsIgnoreCase("reload")) { + if (!senderIsConsole) + { + sender.sendMessage(TotalFreedomMod.MSG_NO_PERMS); + return true; + } TFM_Util.playerMsg(sender, "Reloading permban list...", ChatColor.RED); TotalFreedomMod.loadPermbanConfig(); dumplist(sender); @@ -46,7 +51,7 @@ public class Command_permban extends TFM_Command else { TFM_Util.playerMsg(sender, TotalFreedomMod.permbanned_players.size() + " permanently banned players:"); - TFM_Util.playerMsg(sender, ChatColor.GRAY + StringUtils.join(TotalFreedomMod.permbanned_players, ", ")); + TFM_Util.playerMsg(sender, StringUtils.join(TotalFreedomMod.permbanned_players, ", ")); } if (TotalFreedomMod.permbanned_ips.isEmpty()) @@ -56,7 +61,7 @@ public class Command_permban extends TFM_Command else { TFM_Util.playerMsg(sender, TotalFreedomMod.permbanned_ips.size() + " permanently banned IPs:"); - TFM_Util.playerMsg(sender, ChatColor.GRAY + StringUtils.join(TotalFreedomMod.permbanned_ips, ", ")); + TFM_Util.playerMsg(sender, StringUtils.join(TotalFreedomMod.permbanned_ips, ", ")); } } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java index aa14223d..26a6224e 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_EntityListener.java @@ -39,7 +39,6 @@ public class TFM_EntityListener implements Listener if (!TotalFreedomMod.allowFireSpread) { event.setCancelled(true); - return; } } @@ -53,7 +52,6 @@ public class TFM_EntityListener implements Listener if (!TotalFreedomMod.allowLavaDamage) { event.setCancelled(true); - return; } } } @@ -125,7 +123,6 @@ public class TFM_EntityListener implements Listener if (mobcount > TotalFreedomMod.mobLimiterMax) { event.setCancelled(true); - return; } } } diff --git a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java index c7cce67f..f3cef5a9 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java +++ b/src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java @@ -56,6 +56,10 @@ public class TFM_PlayerListener implements Listener event.setCancelled(true); return; } + case POTION: + { + + } } break; } diff --git a/src/plugin.yml b/src/plugin.yml index 4aae6011..7ed449f5 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -92,6 +92,9 @@ commands: halt: description: Superadmin command - Halts a player usage: / < | all | purge | list> + health: + description: Superadmin command - View ticks-per-second + usage: / kicknoob: description: Superadmin command - Kick all non-superadmins on server. usage: /