From 2e0fb159523be08b261f9ee2b4fccf8283452bf5 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Fri, 18 Nov 2011 18:33:22 +0000 Subject: More code cleanup. --- .../earth2me/essentials/commands/Commandspawnmob.java | 6 +++--- .../com/earth2me/essentials/commands/Commandtime.java | 4 ---- .../src/com/earth2me/essentials/signs/SignTrade.java | 1 + .../chat/EssentialsChatPlayerListenerLowest.java | 2 -- .../com/earth2me/essentials/geoip/EssentialsGeoIP.java | 1 - .../src/com/earth2me/essentials/xmpp/XMPPManager.java | 17 ++--------------- 6 files changed, 6 insertions(+), 25 deletions(-) diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java index db98550e5..7f62e7add 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java @@ -2,7 +2,6 @@ package com.earth2me.essentials.commands; import com.earth2me.essentials.Mob; import com.earth2me.essentials.Mob.MobException; -import com.earth2me.essentials.TargetBlock; import com.earth2me.essentials.User; import com.earth2me.essentials.Util; import java.util.Random; @@ -73,8 +72,9 @@ public class Commandspawnmob extends EssentialsCommand { 8, 9 }; - Block block = (new TargetBlock(user, 300, 0.2, ignore)).getTargetBlock(); - if (block == null) + + final Block block = Util.getTarget(user).getBlock(); + if (block == null) { throw new Exception(Util.i18n("unableToSpawnMob")); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java index 15e0398f8..57ab8a6c6 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandtime.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandtime.java @@ -86,11 +86,7 @@ public class Commandtime extends EssentialsCommand world.setTime(time + 24000 + ticks); } - // Inform the sender of the change - //sender.sendMessage(""); - StringBuilder msg = new StringBuilder(); - boolean first = true; for (World world : worlds) { if (msg.length() > 0) diff --git a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java index cb9c08b2b..ed7ef4db0 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignTrade.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignTrade.java @@ -284,6 +284,7 @@ public class SignTrade extends EssentialsSign if (split.length == 3) { final int stackamount = getIntegerPositive(split[0]); + //TODO: Unused local variable final ItemStack item = getItemStack(split[1], stackamount, ess); final int amount = getInteger(split[2]); final String newline = stackamount + " " + split[1] + ":" + (amount + Math.round(value)); diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java index a7ade803b..ba4e63d98 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListenerLowest.java @@ -1,9 +1,7 @@ package com.earth2me.essentials.chat; -import com.earth2me.essentials.ChargeException; import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.User; -import com.earth2me.essentials.Util; import java.util.Map; import org.bukkit.Server; import org.bukkit.event.player.PlayerChatEvent; diff --git a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java index aa919f44b..5a4049a62 100644 --- a/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java +++ b/EssentialsGeoIP/src/com/earth2me/essentials/geoip/EssentialsGeoIP.java @@ -1,6 +1,5 @@ package com.earth2me.essentials.geoip; -import com.earth2me.essentials.Essentials; import com.earth2me.essentials.IEssentials; import com.earth2me.essentials.Util; import java.util.logging.Level; diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java index cbe89f9d6..a5daa263d 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java @@ -5,27 +5,14 @@ import com.earth2me.essentials.EssentialsConf; import com.earth2me.essentials.IConf; import com.earth2me.essentials.IUser; import java.io.File; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.logging.Handler; import java.util.logging.Level; import java.util.logging.LogRecord; import java.util.logging.Logger; import org.bukkit.entity.Player; -import org.bukkit.plugin.java.JavaPlugin; -import org.jivesoftware.smack.Chat; -import org.jivesoftware.smack.ChatManager; -import org.jivesoftware.smack.ChatManagerListener; -import org.jivesoftware.smack.ConnectionConfiguration; -import org.jivesoftware.smack.MessageListener; import org.jivesoftware.smack.Roster.SubscriptionMode; -import org.jivesoftware.smack.XMPPConnection; -import org.jivesoftware.smack.XMPPException; +import org.jivesoftware.smack.*; import org.jivesoftware.smack.packet.Message; import org.jivesoftware.smack.packet.Presence; import org.jivesoftware.smack.util.StringUtils; -- cgit v1.2.3