From 10de6ac929b19843c37d30c8d7d8dc4371440625 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sun, 6 Apr 2014 15:44:37 +0100 Subject: [PATCH] Cleanup --- Essentials/src/com/earth2me/essentials/IUser.java | 1 - Essentials/src/com/earth2me/essentials/Settings.java | 1 - Essentials/src/com/earth2me/essentials/User.java | 2 +- Essentials/src/com/earth2me/essentials/Worth.java | 1 - .../src/com/earth2me/essentials/commands/Commandfirework.java | 1 - .../src/com/earth2me/essentials/commands/Commandremove.java | 1 - .../src/com/earth2me/essentials/commands/Commandworth.java | 1 - Essentials/src/com/earth2me/essentials/signs/SignEnchant.java | 1 - .../src/com/earth2me/essentials/signs/SignProtection.java | 1 + .../src/com/earth2me/essentials/textreader/BookPager.java | 1 - Essentials/test/com/earth2me/essentials/UserTest.java | 2 -- .../com/earth2me/essentials/antibuild/EssentialsAntiBuild.java | 2 -- .../src/com/earth2me/essentials/xmpp/Commandxmpp.java | 1 - 13 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/IUser.java b/Essentials/src/com/earth2me/essentials/IUser.java index c8946c011..43e729e31 100644 --- a/Essentials/src/com/earth2me/essentials/IUser.java +++ b/Essentials/src/com/earth2me/essentials/IUser.java @@ -8,7 +8,6 @@ import java.util.Set; import net.ess3.api.ITeleport; import net.ess3.api.MaxMoneyException; import org.bukkit.Location; -import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index 1fd501eb3..bedf97f4e 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -233,7 +233,6 @@ public class Settings implements net.ess3.api.ISettings final ConfigurationSection newSection = new MemoryConfiguration(); for (String command : section.getKeys(false)) { - PluginCommand cmd = ess.getServer().getPluginCommand(command); if (command.charAt(0) == '/') { ess.getLogger().warning("Invalid command cost. '" + command + "' should not start with '/'."); diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java index 1b2a8fc6a..ebae1681f 100644 --- a/Essentials/src/com/earth2me/essentials/User.java +++ b/Essentials/src/com/earth2me/essentials/User.java @@ -794,7 +794,7 @@ public class User extends UserData implements Comparable, IReplyTo, net.es public void updateThrottle() { - lastThrottledAction = System.currentTimeMillis();; + lastThrottledAction = System.currentTimeMillis(); } public boolean isFlyClickJump() diff --git a/Essentials/src/com/earth2me/essentials/Worth.java b/Essentials/src/com/earth2me/essentials/Worth.java index fff2c992c..9a3e3fe51 100644 --- a/Essentials/src/com/earth2me/essentials/Worth.java +++ b/Essentials/src/com/earth2me/essentials/Worth.java @@ -13,7 +13,6 @@ import org.bukkit.inventory.ItemStack; public class Worth implements IConf { - private static final Logger logger = Logger.getLogger("Essentials"); private final EssentialsConf config; public Worth(File dataFolder) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java b/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java index 3206d931c..99ac62184 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandfirework.java @@ -32,7 +32,6 @@ import org.bukkit.util.Vector; public class Commandfirework extends EssentialsCommand { - private final transient Pattern splitPattern = Pattern.compile("[:+',;.]"); public Commandfirework() { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java index f8dcc5401..a77b0b863 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandremove.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandremove.java @@ -179,7 +179,6 @@ public class Commandremove extends EssentialsCommand e.remove(); removed++; } - ; break; case ARROWS: if (e instanceof Projectile) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java b/Essentials/src/com/earth2me/essentials/commands/Commandworth.java index 097812ce2..648eb4139 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandworth.java @@ -72,7 +72,6 @@ public class Commandworth extends EssentialsCommand @Override public void run(final Server server, final CommandSource sender, final String commandLabel, final String[] args) throws Exception { - String type = ""; if (args.length < 1) { throw new NotEnoughArgumentsException(); diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java b/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java index ce3b85644..94425be18 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java @@ -83,7 +83,6 @@ public class SignEnchant extends EssentialsSign 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); - int slot = -1; final Trade charge = getTrade(sign, 3, ess); charge.isAffordableFor(player); final String[] enchantLevel = sign.getLine(2).split(":"); diff --git a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java index ac7453464..501782968 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignProtection.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignProtection.java @@ -63,6 +63,7 @@ public class SignProtection extends EssentialsSign { if (b.getLocation().equals(ignoredBlock.getLocation())) { + //TODO: What? } } if (protectedBlocks.contains(b.getType())) diff --git a/Essentials/src/com/earth2me/essentials/textreader/BookPager.java b/Essentials/src/com/earth2me/essentials/textreader/BookPager.java index 711eb1730..b84bfea79 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/BookPager.java +++ b/Essentials/src/com/earth2me/essentials/textreader/BookPager.java @@ -5,7 +5,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; -import org.bukkit.Bukkit; public class BookPager diff --git a/Essentials/test/com/earth2me/essentials/UserTest.java b/Essentials/test/com/earth2me/essentials/UserTest.java index c6e59b509..c1386cfab 100644 --- a/Essentials/test/com/earth2me/essentials/UserTest.java +++ b/Essentials/test/com/earth2me/essentials/UserTest.java @@ -2,8 +2,6 @@ package com.earth2me.essentials; import java.io.IOException; import java.math.BigDecimal; -import java.util.logging.Level; -import java.util.logging.Logger; import junit.framework.TestCase; import net.ess3.api.MaxMoneyException; import org.bukkit.Location; diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuild.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuild.java index c7b2eb7dd..8654b9949 100644 --- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuild.java +++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuild.java @@ -3,7 +3,6 @@ package com.earth2me.essentials.antibuild; import java.util.EnumMap; import java.util.List; import java.util.Map; -import java.util.logging.Logger; import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; @@ -11,7 +10,6 @@ import org.bukkit.plugin.java.JavaPlugin; public class EssentialsAntiBuild extends JavaPlugin implements IAntiBuild { - private static final Logger LOGGER = Logger.getLogger("Minecraft"); private final transient Map settingsBoolean = new EnumMap(AntiBuildConfig.class); private final transient Map> settingsList = new EnumMap>(AntiBuildConfig.class); private transient EssentialsConnect ess = null; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java index 529b4a1c2..f30efc514 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/Commandxmpp.java @@ -5,7 +5,6 @@ import com.earth2me.essentials.Console; import com.earth2me.essentials.commands.EssentialsCommand; import com.earth2me.essentials.commands.NotEnoughArgumentsException; import org.bukkit.Server; -import org.bukkit.entity.Player; public class Commandxmpp extends EssentialsCommand