diff options
3 files changed, 1 insertions, 10 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 043eb688c..0a97fbc5b 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -159,13 +159,6 @@ public class Teleport implements Runnable, ITeleport try { user.checkCooldown(TimestampType.LASTTELEPORT, ess.getRanks().getTeleportCooldown(user), !check, Permissions.TELEPORT_COOLDOWN_BYPASS); - else if (lastTime > earliestLong && !user.isAuthorized("essentials.teleport.cooldown.bypass")) - { - time.setTimeInMillis(lastTime); - time.add(Calendar.SECOND, (int)delay); - time.add(Calendar.MILLISECOND, (int)((delay * 1000.0) % 1000.0)); - throw new Exception(_("timeBeforeTeleport", Util.formatDateDiff(time.getTimeInMillis()))); - } } catch (CooldownException ex) { diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java index 0106c13f4..4130429f8 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandkit.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandkit.java @@ -58,8 +58,7 @@ public class Commandkit extends EssentialsCommand { if (args.length < 2) { - final String kitList = Kit.listKits(ess, null); - sender.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits")); + listKits(sender); throw new NoChargeException(); } { diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java index 2f66da1b4..5ea94eab9 100644 --- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java +++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java @@ -3,7 +3,6 @@ package com.earth2me.essentials.xmpp; import com.earth2me.essentials.api.IReload; import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.utils.Util; -import com.earth2me.essentials.Util; import java.io.File; import java.util.*; import java.util.logging.Handler; |