Upstream
/
Essentials
mirror of https://github.com/EssentialsX/Essentials.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ignore teleport cooldown on /tjail

This commit is contained in:
snowleo 2011-12-04 22:57:40 +01:00
parent cbc744c85a
commit ad60eb538e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/Jail.java
View File

@ -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);
}

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

@ -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));
}

2
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
View File

@ -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)
{