diff options
| author | snowleo <schneeleo@gmail.com> | 2011-12-04 22:57:40 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-12-04 22:57:40 +0100 |
| commit | ad60eb538edb10844e971ef4912778aab9aa0033 (patch) | |
| tree | ed00c8fc814852edde1ff12e3dadcf7b23e10f13 | |
| parent | cbc744c85a970408c01fbc4439c653e860b78ae2 (diff) | |
| download | Essentials-ad60eb538edb10844e971ef4912778aab9aa0033.tar Essentials-ad60eb538edb10844e971ef4912778aab9aa0033.tar.gz Essentials-ad60eb538edb10844e971ef4912778aab9aa0033.tar.lz Essentials-ad60eb538edb10844e971ef4912778aab9aa0033.tar.xz Essentials-ad60eb538edb10844e971ef4912778aab9aa0033.zip | |
Ignore teleport cooldown on /tjail
3 files changed, 7 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Jail.java b/Essentials/src/com/earth2me/essentials/Jail.java index fbbb4376e..b573e4a13 100644 --- a/Essentials/src/com/earth2me/essentials/Jail.java +++ b/Essentials/src/com/earth2me/essentials/Jail.java @@ -46,7 +46,7 @@ public class Jail extends BlockListener implements IConf { if (!(user.getBase() instanceof OfflinePlayer)) { - user.getTeleport().now(getJail(jail)); + user.getTeleport().now(getJail(jail), false); } user.setJail(jail); } diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java index 94371fdde..92a4b77f5 100644 --- a/Essentials/src/com/earth2me/essentials/Teleport.java +++ b/Essentials/src/com/earth2me/essentials/Teleport.java @@ -228,9 +228,12 @@ public class Teleport implements Runnable user.getBase().teleport(Util.getSafeDestination(target.getLocation())); } - public void now(Location loc) throws Exception + public void now(Location loc, boolean cooldown) throws Exception { - cooldown(false); + if (cooldown) + { + cooldown(false); + } now(new Target(loc)); } diff --git a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java index 57b842c82..bca748296 100644 --- a/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java +++ b/EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java @@ -64,7 +64,7 @@ public class EssentialsSpawnPlayerListener extends PlayerListener { try { - user.getTeleport().now(ess.getSpawn().getSpawn(ess.getSettings().getNewbieSpawn())); + user.getTeleport().now(ess.getSpawn().getSpawn(ess.getSettings().getNewbieSpawn()), false); } catch (Exception ex) { |