TheDeusGroup/TFM-4.3-Reloaded
1
0
Fork 0
mirror of https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git synced 2024-06-01 05:41:18 +00:00
Code Issues Projects Releases Wiki Activity

Remove ignore_permissions.

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

6
appinfo.properties
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.BUILDNUM=95
program.BUILDDATE=03/19/2013 11\:50 AM
program.BUILDNUM=96
program.BUILDDATE=03/19/2013 06\:03 PM

4
buildnumber.properties
View file

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

3
src/me/StevenLawson/TotalFreedomMod/Commands/CommandPermissions.java
View file

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

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_adminmode.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcmd.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_blockcommand.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_cage.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_cake.java
View file

@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_cartsit.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Minecart;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_clearall.java
View file

@ -4,7 +4,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

8
src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdlist.java
View file

@ -12,14 +12,14 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
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
{
@Override
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
List<String> commands = new ArrayList<String>();
for (Plugin p : server.getPluginManager().getPlugins())
{
try
@ -40,9 +40,9 @@ public class Command_cmdlist extends TFM_Command
{
}
}
Collections.sort(commands);
sender.sendMessage(StringUtils.join(commands, ","));
return true;

3
src/me/StevenLawson/TotalFreedomMod/Commands/Command_cmdspy.java
View file

@ -5,8 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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_cmdspy extends TFM_Command
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_cookie.java
View file

@ -10,7 +10,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_creative.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_csay.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_deafen.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
private static final Random random = new Random();

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_deop.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_deopall.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_dispfill.java
View file

@ -14,7 +14,7 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_doom.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_enchant.java
View file

@ -6,7 +6,7 @@ import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.Player;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_ender.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_expel.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_explosives.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_fireplace.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_firespread.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_flatlands.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_fluidspread.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_fr.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_fuckoff.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_gadmin.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_gcmd.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_glist.java
View file

@ -12,7 +12,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_gtfo.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_halt.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

9
src/me/StevenLawson/TotalFreedomMod/Commands/Command_health.java
View file

@ -9,8 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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_health extends TFM_Command
{
@Override
@ -36,14 +35,14 @@ public class Command_health extends TFM_Command
float usedMem = runtime.totalMemory() - runtime.freeMemory();
playerMsg("Reserved Memory: " + runtime.totalMemory() / mb + "mb");
playerMsg("Used Memory: " + new DecimalFormat("#").format(usedMem / mb) + "mb (" + new DecimalFormat("#").format(usedMem/runtime.totalMemory()*100) + "%)");
playerMsg("Used Memory: " + new DecimalFormat("#").format(usedMem / mb) + "mb (" + new DecimalFormat("#").format(usedMem / runtime.totalMemory() * 100) + "%)");
playerMsg("Max Memory: " + runtime.maxMemory() / mb + "mb");
playerMsg("Ticks per second: " + (meter.getTicks() == 20 ? ChatColor.GREEN : ChatColor.RED) + meter.getTicks());
}
catch (Exception iex)
{
TFM_Log.warning("Exception in TFM_TickMeter: Thread was interupted in sleeping process.");
TFM_Log.warning(ExceptionUtils.getStackTrace(iex));
TFM_Log.warning("Exception in TFM_TickMeter: Thread was interupted in sleeping process.");
TFM_Log.warning(ExceptionUtils.getStackTrace(iex));
}
}
};

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_kicknoob.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_landmine.java
View file

@ -10,7 +10,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_lastcmd.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavadmg.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_lavaplace.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

4
src/me/StevenLawson/TotalFreedomMod/Commands/Command_list.java
View file

@ -10,7 +10,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override
@ -52,7 +52,7 @@ public class Command_list extends TFM_Command
if (p.getName().equalsIgnoreCase("madgeek1450") || p.getName().equalsIgnoreCase("darthsalamon"))
{
prefix = (ChatColor.DARK_PURPLE+ "[Dev]");
prefix = (ChatColor.DARK_PURPLE + "[Dev]");
}
}
else

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_listsync.java
View file

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_lockup.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_moblimiter.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_mp44.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_nether.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

4
src/me/StevenLawson/TotalFreedomMod/Commands/Command_nonuke.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override
@ -41,7 +41,7 @@ public class Command_nonuke extends TFM_Command
if (args[0].equalsIgnoreCase("on"))
{
TotalFreedomMod.nukeMonitor = true;
playerMsg( "Nuke monitor is enabled.");
playerMsg("Nuke monitor is enabled.");
playerMsg("Anti-freecam range is set to " + TotalFreedomMod.nukeMonitorRange + " blocks.");
playerMsg("Block throttle rate is set to " + TotalFreedomMod.nukeMonitorCountBreak + " blocks destroyed per 5 seconds.");
}

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_o.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_onlinemode.java
View file

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_op.java
View file

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_opall.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

4
src/me/StevenLawson/TotalFreedomMod/Commands/Command_opme.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override
@ -15,7 +15,7 @@ public class Command_opme extends TFM_Command
TFM_Util.adminAction(sender.getName(), "Opping " + sender.getName(), false);
sender.setOp(true);
sender.sendMessage(TotalFreedomMod.YOU_ARE_OP);
return true;
}
}

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_ops.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_orbit.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
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
{
@Override

3
src/me/StevenLawson/TotalFreedomMod/Commands/Command_permban.java
View file

@ -7,8 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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_permban extends TFM_Command
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_potion.java
View file

@ -13,7 +13,7 @@ import org.bukkit.entity.Player;
import org.bukkit.potion.PotionEffect;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_prelog.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_protectarea.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

11
src/me/StevenLawson/TotalFreedomMod/Commands/Command_radar.java
View file

@ -10,7 +10,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override
@ -33,7 +33,7 @@ public class Command_radar extends TFM_Command
}
}
}
if (radar_data.isEmpty())
{
playerMsg("You are the only player in this world. (" + ChatColor.GREEN + "Forever alone..." + ChatColor.YELLOW + ")", ChatColor.YELLOW); //lol
@ -55,14 +55,13 @@ public class Command_radar extends TFM_Command
{
}
}
for (TFM_RadarData i : radar_data)
{
playerMsg(String.format("%s - %d",
i.player.getName(),
Math.round(i.distance)
), ChatColor.YELLOW);
Math.round(i.distance)), ChatColor.YELLOW);
if (--countmax <= 0)
{
break;

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_rank.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_rawsay.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_rd.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_ro.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_saconfig.java
View file

@ -11,7 +11,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_say.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_setlevel.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_setspawnworld.java
View file

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_smite.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_status.java
View file

@ -21,7 +21,7 @@ import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
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 static final Map<String, String> SERVICE_MAP = new HashMap<String, String>();

4
src/me/StevenLawson/TotalFreedomMod/Commands/Command_stfu.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override
@ -92,7 +92,7 @@ public class Command_stfu extends TFM_Command
{
TFM_PlayerData.getPlayerData(p).setMuted(false);
}
TotalFreedomMod.mutePurgeEventId = 0;
}
}, 6000L); // five minutes in ticks: 20*60*5

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_stop.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_survival.java
View file

@ -7,7 +7,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_tempban.java
View file

@ -11,7 +11,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
private static final SimpleDateFormat date_format = new SimpleDateFormat("yyyy-MM-dd \'at\' HH:mm:ss z");

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_terminal.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfbanlist.java
View file

@ -10,7 +10,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfipbanlist.java
View file

@ -11,7 +11,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_tfupdate.java
View file

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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 static final String[] FILES =

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_tossmob.java
View file

@ -12,7 +12,7 @@ import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
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
{
@Override

13
src/me/StevenLawson/TotalFreedomMod/Commands/Command_twitter.java
View file

@ -8,8 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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_twitter extends TFM_Command
{
@Override
@ -30,11 +29,12 @@ public class Command_twitter extends TFM_Command
if ("set".equals(args[0]))
{
if (args.length != 2) {
if (args.length != 2)
{
return false;
}
if(args[1].startsWith("@"))
if (args[1].startsWith("@"))
{
TFM_Util.playerMsg(sender, "Please do not prefix your twitter username with '@'");
return true;
@ -81,8 +81,9 @@ public class Command_twitter extends TFM_Command
TFM_Util.playerMsg(sender, "-- Twitter Information --", ChatColor.BLUE);
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, "Then, you can verify yourself by tweeting " + ChatColor.AQUA + "@TFUpdates #superme");
if ("notfound".equals(reply)) {
TFM_Util.playerMsg(sender, "Then, you can verify yourself by tweeting " + ChatColor.AQUA + "@TFUpdates #superme");
if ("notfound".equals(reply))
{
TFM_Util.playerMsg(sender, "You currently have " + ChatColor.RED + "no" + ChatColor.BLUE + " Twitter handle set.", ChatColor.BLUE);
}
else if ("disabled".equals(reply))

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_uall.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_waterplace.java
View file

@ -5,7 +5,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_whitelist.java
View file

@ -9,7 +9,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_wildcard.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_wipeflatlands.java
View file

@ -6,7 +6,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

2
src/me/StevenLawson/TotalFreedomMod/Commands/Command_ziptool.java
View file

@ -8,7 +8,7 @@ import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
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
{
@Override

107
src/me/StevenLawson/TotalFreedomMod/Commands/TFM_Command.java
View file

@ -65,81 +65,74 @@ public class TFM_Command
CommandPermissions permissions = cmd_class.getAnnotation(CommandPermissions.class);
if (permissions != null)
{
if (permissions.ignore_permissions())
boolean is_super = TFM_SuperadminList.isUserSuperadmin(sender);
boolean is_senior = false;
if (is_super)
{
return true;
is_senior = TFM_SuperadminList.isSeniorAdmin(sender);
}
AdminLevel level = permissions.level();
SourceType source = permissions.source();
boolean block_host_console = permissions.block_host_console();
Player sender_p = null;
if (sender instanceof Player)
{
sender_p = (Player) sender;
}
if (sender_p == null)
{
if (source == SourceType.ONLY_IN_GAME)
{
return false;
}
else if (level == AdminLevel.SENIOR && !is_senior)
{
return false;
}
else if (block_host_console && TFM_Util.isFromHostConsole(sender.getName()))
{
return false;
}
}
else
{
boolean is_super = TFM_SuperadminList.isUserSuperadmin(sender);
boolean is_senior = false;
if (is_super)
if (source == SourceType.ONLY_CONSOLE)
{
is_senior = TFM_SuperadminList.isSeniorAdmin(sender);
return false;
}
AdminLevel level = permissions.level();
SourceType source = permissions.source();
boolean block_host_console = permissions.block_host_console();
Player sender_p = null;
if (sender instanceof Player)
else if (level == AdminLevel.SENIOR)
{
sender_p = (Player) sender;
}
if (is_senior)
{
TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
Boolean superadminIdVerified = playerdata.isSuperadminIdVerified();
if (sender_p == null)
{
if (source == SourceType.ONLY_IN_GAME)
{
return false;
}
else if (level == AdminLevel.SENIOR && !is_senior)
{
return false;
}
else if (block_host_console && TFM_Util.isFromHostConsole(sender.getName()))
{
return false;
}
}
else
{
if (source == SourceType.ONLY_CONSOLE)
{
return false;
}
else if (level == AdminLevel.SENIOR)
{
if (is_senior)
if (superadminIdVerified != null)
{
TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
Boolean superadminIdVerified = playerdata.isSuperadminIdVerified();
if (superadminIdVerified != null)
if (!superadminIdVerified.booleanValue())
{
if (!superadminIdVerified.booleanValue())
{
return false;
}
return false;
}
}
else
{
return false;
}
}
else if (level == AdminLevel.SUPER && !is_super)
{
return false;
}
else if (level == AdminLevel.OP && !sender_p.isOp())
else
{
return false;
}
}
return true;
else if (level == AdminLevel.SUPER && !is_super)
{
return false;
}
else if (level == AdminLevel.OP && !sender_p.isOp())
{
return false;
}
}
return true;
}
return true;
}

3
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_BlockListener.java
View file

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

3
src/me/StevenLawson/TotalFreedomMod/Listener/TFM_PlayerListener.java
View file

@ -58,7 +58,6 @@ public class TFM_PlayerListener implements Listener
}
case POTION:
{
}
}
break;
@ -588,7 +587,7 @@ public class TFM_PlayerListener implements Listener
}
return;
}
if (!TFM_SuperadminList.isUserSuperadmin(p))
{
for (Player pl : Bukkit.getOnlinePlayers())

1
src/me/StevenLawson/TotalFreedomMod/SerializableLocation.java
View file

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

2
src/me/StevenLawson/TotalFreedomMod/TFM_LandmineData.java
View file

@ -8,7 +8,7 @@ import org.bukkit.entity.Player;
public class TFM_LandmineData
{
public static List<TFM_LandmineData> landmines = new ArrayList<TFM_LandmineData>();
public Location landmine_pos;
public Player player;
public double radius;

1
src/me/StevenLawson/TotalFreedomMod/TFM_PlayerData.java
View file

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

2
src/me/StevenLawson/TotalFreedomMod/TFM_TickMeter.java
View file

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

21
src/me/StevenLawson/TotalFreedomMod/TFM_TwitterHandler.java
View file

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

12
src/me/StevenLawson/TotalFreedomMod/TFM_UserList.java
View file

@ -90,7 +90,7 @@ public class TFM_UserList
public void addUser(String username, String ip_address)
{
username = username.toLowerCase();
TFM_UserListEntry entry = _userlist.get(username);
if (entry == null)
{
@ -123,7 +123,7 @@ public class TFM_UserList
{
addUser(p);
}
exportList();
}
@ -132,15 +132,15 @@ public class TFM_UserList
private String _username;
private List<String> _ip_addresses = new ArrayList<String>();
public TFM_UserListEntry(String username, List<String>ip_addresses)
public TFM_UserListEntry(String username, List<String> ip_addresses)
{
_username = username;
_ip_addresses = ip_addresses;
_username = username;
_ip_addresses = ip_addresses;
}
public TFM_UserListEntry(String username)
{
_username = username;
_username = username;
}
public List<String> getIpAddresses()

2
src/me/StevenLawson/TotalFreedomMod/TotalFreedomMod.java
View file

@ -298,7 +298,7 @@ public class TotalFreedomMod extends JavaPlugin
TFM_Log.severe("Error loading superadmin list: " + ex.getMessage());
}
}
public static List<String> permbanned_players = new ArrayList<String>();
public static List<String> permbanned_ips = new ArrayList<String>();