summaryrefslogtreecommitdiffstats
path: root/Essentials/src/net/ess3/Teleport.java
diff options
context:
space:
mode:
Diffstat (limited to 'Essentials/src/net/ess3/Teleport.java')
-rw-r--r--Essentials/src/net/ess3/Teleport.java9
1 files changed, 3 insertions, 6 deletions
diff --git a/Essentials/src/net/ess3/Teleport.java b/Essentials/src/net/ess3/Teleport.java
index b97b1f58d..81afaf97f 100644
--- a/Essentials/src/net/ess3/Teleport.java
+++ b/Essentials/src/net/ess3/Teleport.java
@@ -21,7 +21,6 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
public class Teleport implements Runnable, ITeleport
{
private static final double MOVE_CONSTANT = 0.3;
-
private IUser user;
private IUser teleportUser;
private int teleTimer = -1;
@@ -75,9 +74,9 @@ public class Teleport implements Runnable, ITeleport
}
if (!Permissions.TELEPORT_TIMER_MOVE.isAuthorized(user) && (Math.round(
- teleportUser.getPlayer().getLocation().getX() * MOVE_CONSTANT) != initX || Math.round(
- teleportUser.getPlayer().getLocation().getY() * MOVE_CONSTANT) != initY || Math.round(
- teleportUser.getPlayer().getLocation().getZ() * MOVE_CONSTANT) != initZ || teleportUser.getPlayer().getHealth() < health))
+ teleportUser.getPlayer().getLocation().getX() * MOVE_CONSTANT) != initX || Math.round(
+ teleportUser.getPlayer().getLocation().getY() * MOVE_CONSTANT) != initY || Math.round(
+ teleportUser.getPlayer().getLocation().getZ() * MOVE_CONSTANT) != initZ || teleportUser.getPlayer().getHealth() < health))
{ // user moved, cancel teleport
cancel(true);
return;
@@ -123,7 +122,6 @@ public class Teleport implements Runnable, ITeleport
this.ess = ess;
}
-
public void cooldown(boolean check) throws Exception
{
try
@@ -233,7 +231,6 @@ public class Teleport implements Runnable, ITeleport
now(new Target(loc), cause);
}
-
@Override
//The now function is used when you want to skip tp delay when teleporting someone to a location or player.
public void now(Entity entity, boolean cooldown, TeleportCause cause) throws Exception