mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2025-02-22 16:37:25 +00:00
Cleanup
This commit is contained in:
parent
fe9fbf585f
commit
10de6ac929
13 changed files with 2 additions and 14 deletions
|
@ -8,7 +8,6 @@ import java.util.Set;
|
||||||
import net.ess3.api.ITeleport;
|
import net.ess3.api.ITeleport;
|
||||||
import net.ess3.api.MaxMoneyException;
|
import net.ess3.api.MaxMoneyException;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.command.CommandSender;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -233,7 +233,6 @@ public class Settings implements net.ess3.api.ISettings
|
||||||
final ConfigurationSection newSection = new MemoryConfiguration();
|
final ConfigurationSection newSection = new MemoryConfiguration();
|
||||||
for (String command : section.getKeys(false))
|
for (String command : section.getKeys(false))
|
||||||
{
|
{
|
||||||
PluginCommand cmd = ess.getServer().getPluginCommand(command);
|
|
||||||
if (command.charAt(0) == '/')
|
if (command.charAt(0) == '/')
|
||||||
{
|
{
|
||||||
ess.getLogger().warning("Invalid command cost. '" + command + "' should not start with '/'.");
|
ess.getLogger().warning("Invalid command cost. '" + command + "' should not start with '/'.");
|
||||||
|
|
|
@ -794,7 +794,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, net.es
|
||||||
|
|
||||||
public void updateThrottle()
|
public void updateThrottle()
|
||||||
{
|
{
|
||||||
lastThrottledAction = System.currentTimeMillis();;
|
lastThrottledAction = System.currentTimeMillis();
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isFlyClickJump()
|
public boolean isFlyClickJump()
|
||||||
|
|
|
@ -13,7 +13,6 @@ import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
public class Worth implements IConf
|
public class Worth implements IConf
|
||||||
{
|
{
|
||||||
private static final Logger logger = Logger.getLogger("Essentials");
|
|
||||||
private final EssentialsConf config;
|
private final EssentialsConf config;
|
||||||
|
|
||||||
public Worth(File dataFolder)
|
public Worth(File dataFolder)
|
||||||
|
|
|
@ -32,7 +32,6 @@ import org.bukkit.util.Vector;
|
||||||
|
|
||||||
public class Commandfirework extends EssentialsCommand
|
public class Commandfirework extends EssentialsCommand
|
||||||
{
|
{
|
||||||
private final transient Pattern splitPattern = Pattern.compile("[:+',;.]");
|
|
||||||
|
|
||||||
public Commandfirework()
|
public Commandfirework()
|
||||||
{
|
{
|
||||||
|
|
|
@ -179,7 +179,6 @@ public class Commandremove extends EssentialsCommand
|
||||||
e.remove();
|
e.remove();
|
||||||
removed++;
|
removed++;
|
||||||
}
|
}
|
||||||
;
|
|
||||||
break;
|
break;
|
||||||
case ARROWS:
|
case ARROWS:
|
||||||
if (e instanceof Projectile)
|
if (e instanceof Projectile)
|
||||||
|
|
|
@ -72,7 +72,6 @@ public class Commandworth extends EssentialsCommand
|
||||||
@Override
|
@Override
|
||||||
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
|
public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception
|
||||||
{
|
{
|
||||||
String type = "";
|
|
||||||
if (args.length < 1)
|
if (args.length < 1)
|
||||||
{
|
{
|
||||||
throw new NotEnoughArgumentsException();
|
throw new NotEnoughArgumentsException();
|
||||||
|
|
|
@ -83,7 +83,6 @@ public class SignEnchant extends EssentialsSign
|
||||||
protected boolean onSignInteract(ISign sign, User player, String username, IEssentials ess) throws SignException, ChargeException
|
protected boolean onSignInteract(ISign sign, User player, String username, IEssentials ess) throws SignException, ChargeException
|
||||||
{
|
{
|
||||||
final ItemStack search = sign.getLine(1).equals("*") || sign.getLine(1).equalsIgnoreCase("any") ? null : getItemStack(sign.getLine(1), 1, ess);
|
final ItemStack search = sign.getLine(1).equals("*") || sign.getLine(1).equalsIgnoreCase("any") ? null : getItemStack(sign.getLine(1), 1, ess);
|
||||||
int slot = -1;
|
|
||||||
final Trade charge = getTrade(sign, 3, ess);
|
final Trade charge = getTrade(sign, 3, ess);
|
||||||
charge.isAffordableFor(player);
|
charge.isAffordableFor(player);
|
||||||
final String[] enchantLevel = sign.getLine(2).split(":");
|
final String[] enchantLevel = sign.getLine(2).split(":");
|
||||||
|
|
|
@ -63,6 +63,7 @@ public class SignProtection extends EssentialsSign
|
||||||
{
|
{
|
||||||
if (b.getLocation().equals(ignoredBlock.getLocation()))
|
if (b.getLocation().equals(ignoredBlock.getLocation()))
|
||||||
{
|
{
|
||||||
|
//TODO: What?
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (protectedBlocks.contains(b.getType()))
|
if (protectedBlocks.contains(b.getType()))
|
||||||
|
|
|
@ -5,7 +5,6 @@ import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
|
|
||||||
|
|
||||||
public class BookPager
|
public class BookPager
|
||||||
|
|
|
@ -2,8 +2,6 @@ package com.earth2me.essentials;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.util.logging.Level;
|
|
||||||
import java.util.logging.Logger;
|
|
||||||
import junit.framework.TestCase;
|
import junit.framework.TestCase;
|
||||||
import net.ess3.api.MaxMoneyException;
|
import net.ess3.api.MaxMoneyException;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
|
|
|
@ -3,7 +3,6 @@ package com.earth2me.essentials.antibuild;
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.logging.Logger;
|
|
||||||
import org.bukkit.plugin.Plugin;
|
import org.bukkit.plugin.Plugin;
|
||||||
import org.bukkit.plugin.PluginManager;
|
import org.bukkit.plugin.PluginManager;
|
||||||
import org.bukkit.plugin.java.JavaPlugin;
|
import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
@ -11,7 +10,6 @@ import org.bukkit.plugin.java.JavaPlugin;
|
||||||
|
|
||||||
public class EssentialsAntiBuild extends JavaPlugin implements IAntiBuild
|
public class EssentialsAntiBuild extends JavaPlugin implements IAntiBuild
|
||||||
{
|
{
|
||||||
private static final Logger LOGGER = Logger.getLogger("Minecraft");
|
|
||||||
private final transient Map<AntiBuildConfig, Boolean> settingsBoolean = new EnumMap<AntiBuildConfig, Boolean>(AntiBuildConfig.class);
|
private final transient Map<AntiBuildConfig, Boolean> settingsBoolean = new EnumMap<AntiBuildConfig, Boolean>(AntiBuildConfig.class);
|
||||||
private final transient Map<AntiBuildConfig, List<Integer>> settingsList = new EnumMap<AntiBuildConfig, List<Integer>>(AntiBuildConfig.class);
|
private final transient Map<AntiBuildConfig, List<Integer>> settingsList = new EnumMap<AntiBuildConfig, List<Integer>>(AntiBuildConfig.class);
|
||||||
private transient EssentialsConnect ess = null;
|
private transient EssentialsConnect ess = null;
|
||||||
|
|
|
@ -5,7 +5,6 @@ import com.earth2me.essentials.Console;
|
||||||
import com.earth2me.essentials.commands.EssentialsCommand;
|
import com.earth2me.essentials.commands.EssentialsCommand;
|
||||||
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
|
import com.earth2me.essentials.commands.NotEnoughArgumentsException;
|
||||||
import org.bukkit.Server;
|
import org.bukkit.Server;
|
||||||
import org.bukkit.entity.Player;
|
|
||||||
|
|
||||||
|
|
||||||
public class Commandxmpp extends EssentialsCommand
|
public class Commandxmpp extends EssentialsCommand
|
||||||
|
|
Loading…
Reference in a new issue