minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-08 07:36:42 +02:00
Code Issues Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
ementalo
2012-06-25 22:24:10 +01:00
parent 283a9ce9fa
commit f8bb4d058d
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Essentials/src/com/earth2me/essentials/Teleport.java
View File

@@ -159,13 +159,6 @@ public class Teleport implements Runnable, ITeleport
try try
{ {
user.checkCooldown(TimestampType.LASTTELEPORT, ess.getRanks().getTeleportCooldown(user), !check, Permissions.TELEPORT_COOLDOWN_BYPASS); 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) catch (CooldownException ex)
{ {

3
Essentials/src/com/earth2me/essentials/commands/Commandkit.java
View File

@@ -58,8 +58,7 @@ public class Commandkit extends EssentialsCommand
{ {
if (args.length < 2) if (args.length < 2)
{ {
final String kitList = Kit.listKits(ess, null); listKits(sender);
sender.sendMessage(kitList.length() > 0 ? _("kits", kitList) : _("noKits"));
throw new NoChargeException(); throw new NoChargeException();
} }
{ {

1
EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
View File

@@ -3,7 +3,6 @@ package com.earth2me.essentials.xmpp;
import com.earth2me.essentials.api.IReload; import com.earth2me.essentials.api.IReload;
import com.earth2me.essentials.api.IUser; import com.earth2me.essentials.api.IUser;
import com.earth2me.essentials.utils.Util; import com.earth2me.essentials.utils.Util;
import com.earth2me.essentials.Util;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
import java.util.logging.Handler; import java.util.logging.Handler;