mirror of
https://github.com/EssentialsX/Essentials.git
synced 2024-12-23 01:27:40 +01:00
Ignore teleport cooldown on /tjail
This commit is contained in:
parent
cbc744c85a
commit
ad60eb538e
@ -46,7 +46,7 @@ public class Jail extends BlockListener implements IConf
|
|||||||
{
|
{
|
||||||
if (!(user.getBase() instanceof OfflinePlayer))
|
if (!(user.getBase() instanceof OfflinePlayer))
|
||||||
{
|
{
|
||||||
user.getTeleport().now(getJail(jail));
|
user.getTeleport().now(getJail(jail), false);
|
||||||
}
|
}
|
||||||
user.setJail(jail);
|
user.setJail(jail);
|
||||||
}
|
}
|
||||||
|
@ -228,9 +228,12 @@ public class Teleport implements Runnable
|
|||||||
user.getBase().teleport(Util.getSafeDestination(target.getLocation()));
|
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));
|
now(new Target(loc));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ public class EssentialsSpawnPlayerListener extends PlayerListener
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
user.getTeleport().now(ess.getSpawn().getSpawn(ess.getSettings().getNewbieSpawn()));
|
user.getTeleport().now(ess.getSpawn().getSpawn(ess.getSettings().getNewbieSpawn()), false);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user