Remove ignore_permissions.

Mass formatting autofix.
This commit is contained in:
Steven Lawson 2013-03-19 18:05:20 -04:00
parent 028d15c796
commit 71ec3d3a4d
99 changed files with 183 additions and 199 deletions

View File

@ -1,5 +1,5 @@
#Tue, 19 Mar 2013 11:50:18 +0100 #Tue, 19 Mar 2013 18:03:45 -0400
program.VERSION=2.11 program.VERSION=2.11
program.BUILDNUM=95 program.BUILDNUM=96
program.BUILDDATE=03/19/2013 11\:50 AM program.BUILDDATE=03/19/2013 06\:03 PM

View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Tue Mar 19 11:50:18 CET 2013 #Tue Mar 19 18:03:45 EDT 2013
build.number=95 build.number=97

View File

@ -11,7 +11,4 @@ public @interface CommandPermissions
SourceType source(); SourceType source();
boolean block_host_console() default false; boolean block_host_console() default false;
boolean ignore_permissions() default false; // O_o
} }

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_adminmode extends TFM_Command public class Command_adminmode extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_blockcmd extends TFM_Command public class Command_blockcmd extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_blockcommand extends TFM_Command public class Command_blockcommand extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_cage extends TFM_Command public class Command_cage extends TFM_Command
{ {
@Override @Override

View File

@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_cake extends TFM_Command public class Command_cake extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Minecart; import org.bukkit.entity.Minecart;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true) @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
public class Command_cartsit extends TFM_Command public class Command_cartsit extends TFM_Command
{ {
@Override @Override

View File

@ -4,7 +4,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_clearall extends TFM_Command public class Command_clearall extends TFM_Command
{ {
@Override @Override

View File

@ -12,7 +12,7 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.PluginDescriptionFile;
@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true) @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
public class Command_cmdlist extends TFM_Command public class Command_cmdlist extends TFM_Command
{ {
@Override @Override

View File

@ -5,8 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
public class Command_cmdspy extends TFM_Command public class Command_cmdspy extends TFM_Command
{ {
@Override @Override

View File

@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_cookie extends TFM_Command public class Command_cookie extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
public class Command_creative extends TFM_Command public class Command_creative extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE)
public class Command_csay extends TFM_Command public class Command_csay extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true)
public class Command_deafen extends TFM_Command public class Command_deafen extends TFM_Command
{ {
private static final Random random = new Random(); private static final Random random = new Random();

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_deop extends TFM_Command public class Command_deop extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_deopall extends TFM_Command public class Command_deopall extends TFM_Command
{ {
@Override @Override

View File

@ -14,7 +14,7 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory; import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
public class Command_dispfill extends TFM_Command public class Command_dispfill extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE)
public class Command_doom extends TFM_Command public class Command_doom extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
public class Command_enchant extends TFM_Command public class Command_enchant extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true) @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
public class Command_ender extends TFM_Command public class Command_ender extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
public class Command_expel extends TFM_Command public class Command_expel extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_explosives extends TFM_Command public class Command_explosives extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_fireplace extends TFM_Command public class Command_fireplace extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_firespread extends TFM_Command public class Command_firespread extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true) @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
public class Command_flatlands extends TFM_Command public class Command_flatlands extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_fluidspread extends TFM_Command public class Command_fluidspread extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_fr extends TFM_Command public class Command_fr extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_IN_GAME)
public class Command_fuckoff extends TFM_Command public class Command_fuckoff extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_gadmin extends TFM_Command public class Command_gadmin extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_gcmd extends TFM_Command public class Command_gcmd extends TFM_Command
{ {
@Override @Override

View File

@ -12,7 +12,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_glist extends TFM_Command public class Command_glist extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_gtfo extends TFM_Command public class Command_gtfo extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_halt extends TFM_Command public class Command_halt extends TFM_Command
{ {
@Override @Override

View File

@ -9,8 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false)
public class Command_health extends TFM_Command public class Command_health extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.BOTH, block_host_console = true)
public class Command_kicknoob extends TFM_Command public class Command_kicknoob extends TFM_Command
{ {
@Override @Override

View File

@ -10,7 +10,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
public class Command_landmine extends TFM_Command public class Command_landmine extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_lastcmd extends TFM_Command public class Command_lastcmd extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_lavadmg extends TFM_Command public class Command_lavadmg extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_lavaplace extends TFM_Command public class Command_lavaplace extends TFM_Command
{ {
@Override @Override

View File

@ -10,7 +10,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true) @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
public class Command_list extends TFM_Command public class Command_list extends TFM_Command
{ {
@Override @Override

View File

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_listsync extends TFM_Command public class Command_listsync extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitTask; import org.bukkit.scheduler.BukkitTask;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_lockup extends TFM_Command public class Command_lockup extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_CONSOLE)
public class Command_moblimiter extends TFM_Command public class Command_moblimiter extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.*; import org.bukkit.entity.*;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
public class Command_mp extends TFM_Command public class Command_mp extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
public class Command_mp44 extends TFM_Command public class Command_mp44 extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true) @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
public class Command_nether extends TFM_Command public class Command_nether extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_nonuke extends TFM_Command public class Command_nonuke extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_o extends TFM_Command public class Command_o extends TFM_Command
{ {
@Override @Override

View File

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_onlinemode extends TFM_Command public class Command_onlinemode extends TFM_Command
{ {
@Override @Override

View File

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
public class Command_op extends TFM_Command public class Command_op extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_opall extends TFM_Command public class Command_opall extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
public class Command_opme extends TFM_Command public class Command_opme extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
public class Command_ops extends TFM_Command public class Command_ops extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_orbit extends TFM_Command public class Command_orbit extends TFM_Command
{ {
@Override @Override

View File

@ -7,8 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false)
public class Command_permban extends TFM_Command public class Command_permban extends TFM_Command
{ {
@Override @Override

View File

@ -13,7 +13,7 @@ import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffect;
import org.bukkit.potion.PotionEffectType; import org.bukkit.potion.PotionEffectType;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
public class Command_potion extends TFM_Command public class Command_potion extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_prelog extends TFM_Command public class Command_prelog extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_protectarea extends TFM_Command public class Command_protectarea extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_qdeop extends TFM_Command public class Command_qdeop extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_qop extends TFM_Command public class Command_qop extends TFM_Command
{ {
@Override @Override

View File

@ -10,7 +10,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.ALL, source = SourceType.ONLY_IN_GAME)
public class Command_radar extends TFM_Command public class Command_radar extends TFM_Command
{ {
@Override @Override
@ -60,8 +60,7 @@ public class Command_radar extends TFM_Command
{ {
playerMsg(String.format("%s - %d", playerMsg(String.format("%s - %d",
i.player.getName(), i.player.getName(),
Math.round(i.distance) Math.round(i.distance)), ChatColor.YELLOW);
), ChatColor.YELLOW);
if (--countmax <= 0) if (--countmax <= 0)
{ {

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true) @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
public class Command_rank extends TFM_Command public class Command_rank extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_rawsay extends TFM_Command public class Command_rawsay extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_rd extends TFM_Command public class Command_rd extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = false, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, block_host_console = false)
public class Command_ro extends TFM_Command public class Command_ro extends TFM_Command
{ {
@Override @Override

View File

@ -11,7 +11,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
public class Command_saconfig extends TFM_Command public class Command_saconfig extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_say extends TFM_Command public class Command_say extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
public class Command_setlevel extends TFM_Command public class Command_setlevel extends TFM_Command
{ {
@Override @Override

View File

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
public class Command_setspawnworld extends TFM_Command public class Command_setspawnworld extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_smite extends TFM_Command public class Command_smite extends TFM_Command
{ {
@Override @Override

View File

@ -21,7 +21,7 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
import org.json.simple.JSONValue; import org.json.simple.JSONValue;
@CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH, ignore_permissions = true) @CommandPermissions(level = AdminLevel.ALL, source = SourceType.BOTH)
public class Command_status extends TFM_Command public class Command_status extends TFM_Command
{ {
public static final Map<String, String> SERVICE_MAP = new HashMap<String, String>(); public static final Map<String, String> SERVICE_MAP = new HashMap<String, String>();

View File

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_stfu extends TFM_Command public class Command_stfu extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_stop extends TFM_Command public class Command_stop extends TFM_Command
{ {
@Override @Override

View File

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
public class Command_survival extends TFM_Command public class Command_survival extends TFM_Command
{ {
@Override @Override

View File

@ -11,7 +11,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_tempban extends TFM_Command public class Command_tempban extends TFM_Command
{ {
private static final SimpleDateFormat date_format = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z"); private static final SimpleDateFormat date_format = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_terminal extends TFM_Command public class Command_terminal extends TFM_Command
{ {
@Override @Override

View File

@ -10,7 +10,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
public class Command_tfbanlist extends TFM_Command public class Command_tfbanlist extends TFM_Command
{ {
@Override @Override

View File

@ -11,7 +11,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
public class Command_tfipbanlist extends TFM_Command public class Command_tfipbanlist extends TFM_Command
{ {
@Override @Override

View File

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_tfupdate extends TFM_Command public class Command_tfupdate extends TFM_Command
{ {
public static final String[] FILES = public static final String[] FILES =

View File

@ -12,7 +12,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.ONLY_IN_GAME)
public class Command_tossmob extends TFM_Command public class Command_tossmob extends TFM_Command
{ {
@Override @Override

View File

@ -8,8 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME, ignore_permissions = false)
public class Command_twitter extends TFM_Command public class Command_twitter extends TFM_Command
{ {
@Override @Override
@ -30,7 +29,8 @@ public class Command_twitter extends TFM_Command
if ("set".equals(args[0])) if ("set".equals(args[0]))
{ {
if (args.length != 2) { if (args.length != 2)
{
return false; return false;
} }
@ -82,7 +82,8 @@ public class Command_twitter extends TFM_Command
TFM_Util.playerMsg(sender, "Using this feature, you can re-super yourself using twitter."); TFM_Util.playerMsg(sender, "Using this feature, you can re-super yourself using twitter.");
TFM_Util.playerMsg(sender, "You can set your twitter handle using " + ChatColor.AQUA + "/twitter set [twittername]"); TFM_Util.playerMsg(sender, "You can set your twitter handle using " + ChatColor.AQUA + "/twitter set [twittername]");
TFM_Util.playerMsg(sender, "Then, you can verify yourself by tweeting " + ChatColor.AQUA + "@TFUpdates #superme"); TFM_Util.playerMsg(sender, "Then, you can verify yourself by tweeting " + ChatColor.AQUA + "@TFUpdates #superme");
if ("notfound".equals(reply)) { if ("notfound".equals(reply))
{
TFM_Util.playerMsg(sender, "You currently have " + ChatColor.RED + "no" + ChatColor.BLUE + " Twitter handle set.", ChatColor.BLUE); TFM_Util.playerMsg(sender, "You currently have " + ChatColor.RED + "no" + ChatColor.BLUE + " Twitter handle set.", ChatColor.BLUE);
} }
else if ("disabled".equals(reply)) else if ("disabled".equals(reply))

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_uall extends TFM_Command public class Command_uall extends TFM_Command
{ {
@Override @Override

View File

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_waterplace extends TFM_Command public class Command_waterplace extends TFM_Command
{ {
@Override @Override

View File

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.OP, source = SourceType.BOTH)
public class Command_whitelist extends TFM_Command public class Command_whitelist extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SUPER, source = SourceType.BOTH)
public class Command_wildcard extends TFM_Command public class Command_wildcard extends TFM_Command
{ {
@Override @Override

View File

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_wipeflatlands extends TFM_Command public class Command_wipeflatlands extends TFM_Command
{ {
@Override @Override

View File

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true, ignore_permissions = false) @CommandPermissions(level = AdminLevel.SENIOR, source = SourceType.ONLY_CONSOLE, block_host_console = true)
public class Command_ziptool extends TFM_Command public class Command_ziptool extends TFM_Command
{ {
@Override @Override

View File

@ -64,12 +64,6 @@ public class TFM_Command
{ {
CommandPermissions permissions = cmd_class.getAnnotation(CommandPermissions.class); CommandPermissions permissions = cmd_class.getAnnotation(CommandPermissions.class);
if (permissions != null) if (permissions != null)
{
if (permissions.ignore_permissions())
{
return true;
}
else
{ {
boolean is_super = TFM_SuperadminList.isUserSuperadmin(sender); boolean is_super = TFM_SuperadminList.isUserSuperadmin(sender);
boolean is_senior = false; boolean is_senior = false;
@ -140,7 +134,6 @@ public class TFM_Command
} }
return true; return true;
} }
}
return true; return true;
} }

View File

@ -1,9 +1,9 @@
package me.StevenLawson.TotalFreedomMod.Listener; package me.StevenLawson.TotalFreedomMod.Listener;
import me.StevenLawson.TotalFreedomMod.TFM_Log; import me.StevenLawson.TotalFreedomMod.TFM_Log;
import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea; import me.StevenLawson.TotalFreedomMod.TFM_ProtectedArea;
import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList; import me.StevenLawson.TotalFreedomMod.TFM_SuperadminList;
import me.StevenLawson.TotalFreedomMod.TFM_PlayerData;
import me.StevenLawson.TotalFreedomMod.TFM_Util; import me.StevenLawson.TotalFreedomMod.TFM_Util;
import me.StevenLawson.TotalFreedomMod.TotalFreedomMod; import me.StevenLawson.TotalFreedomMod.TotalFreedomMod;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
@ -250,7 +250,6 @@ public class TFM_BlockListener implements Listener
event.setCancelled(true); event.setCancelled(true);
} }
} }
// @EventHandler(priority = EventPriority.NORMAL) // @EventHandler(priority = EventPriority.NORMAL)
// public void onCommandBlockChangeEvent(CommandBlockChangeEvent event) // public void onCommandBlockChangeEvent(CommandBlockChangeEvent event)
// { // {

View File

@ -58,7 +58,6 @@ public class TFM_PlayerListener implements Listener
} }
case POTION: case POTION:
{ {
} }
} }
break; break;

View File

@ -10,7 +10,6 @@ import org.bukkit.World;
// From: http://forums.bukkit.org/threads/location-serialized.105851/ // From: http://forums.bukkit.org/threads/location-serialized.105851/
// By: gcflames5 // By: gcflames5
public final class SerializableLocation implements Serializable public final class SerializableLocation implements Serializable
{ {
private static final long serialVersionUID = 7498864812883577904L; private static final long serialVersionUID = 7498864812883577904L;

View File

@ -475,5 +475,4 @@ public class TFM_PlayerData
{ {
return cmdspy_enabled; return cmdspy_enabled;
} }
} }

View File

@ -2,7 +2,6 @@ package me.StevenLawson.TotalFreedomMod;
public class TFM_TickMeter public class TFM_TickMeter
{ {
int ticks; int ticks;
int taskId; int taskId;
final TotalFreedomMod plugin; final TotalFreedomMod plugin;
@ -36,5 +35,4 @@ public class TFM_TickMeter
{ {
return ticks; return ticks;
} }
} }

View File

@ -6,9 +6,8 @@ import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
import org.apache.commons.lang.exception.ExceptionUtils; import org.apache.commons.lang.exception.ExceptionUtils;
public class TFM_TwitterHandler
public class TFM_TwitterHandler { {
private TotalFreedomMod plugin; private TotalFreedomMod plugin;
private TFM_TwitterHandler(TotalFreedomMod plugin) private TFM_TwitterHandler(TotalFreedomMod plugin)
@ -30,19 +29,23 @@ public class TFM_TwitterHandler {
return request("action=settwitter&player=" + player + "&twitter=" + twitter); return request("action=settwitter&player=" + player + "&twitter=" + twitter);
} }
public String delTwitter(String player) { public String delTwitter(String player)
{
return request("action=deltwitter&player=" + player); return request("action=deltwitter&player=" + player);
} }
public String isEnabled() { public String isEnabled()
{
return request("action=getstatus"); return request("action=getstatus");
} }
public String setEnabled(String status) { public String setEnabled(String status)
{
return request("action=setstatus&status=" + status); return request("action=setstatus&status=" + status);
} }
private String request(String queryString) { private String request(String queryString)
{
String line = "failed"; String line = "failed";
try try
{ {
@ -60,8 +63,8 @@ public class TFM_TwitterHandler {
return line; return line;
} }
public static TFM_TwitterHandler getInstance(TotalFreedomMod plugin) { public static TFM_TwitterHandler getInstance(TotalFreedomMod plugin)
{
return new TFM_TwitterHandler(plugin); return new TFM_TwitterHandler(plugin);
} }
} }