Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-18 16:45:37 +01:00
Code Issues Projects Releases Wiki Activity

Fix tp delay message

Browse Source
This commit is contained in:
KHobbits 2012-10-23 00:00:55 +01:00
parent 7c480e88d6
commit 0bc33554f3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ public class Teleport implements Runnable, ITeleport
private IUser teleportUser; private IUser teleportUser;
private int teleTimer = -1; private int teleTimer = -1;
private long started; // time this task was initiated private long started; // time this task was initiated
private long delay; // how long to delay the teleport private long tpdelay; // how long to delay the teleport
private int health; private int health;
// note that I initially stored a clone of the location for reference, but... // note that I initially stored a clone of the location for reference, but...
// when comparing locations, I got incorrect mismatches (rounding errors, looked like) // when comparing locations, I got incorrect mismatches (rounding errors, looked like)
@ -69,7 +69,7 @@ public class Teleport implements Runnable, ITeleport
private void initTimer(long delay, IUser teleportUser, Target target, Trade chargeFor, TeleportCause cause) private void initTimer(long delay, IUser teleportUser, Target target, Trade chargeFor, TeleportCause cause)
{ {
this.started = System.currentTimeMillis(); this.started = System.currentTimeMillis();
this.delay = delay; this.tpdelay = delay;
this.health = teleportUser.getHealth(); this.health = teleportUser.getHealth();
this.initX = Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT); this.initX = Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT);
this.initY = Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT); this.initY = Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT);
@ -107,7 +107,7 @@ public class Teleport implements Runnable, ITeleport
} }
health = teleportUser.getHealth(); // in case user healed, then later gets injured health = teleportUser.getHealth(); // in case user healed, then later gets injured
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
if (now > started + delay) if (now > started + tpdelay)
{ {
try try
{ {
@ -273,7 +273,7 @@ public class Teleport implements Runnable, ITeleport
} }
cancel(false); cancel(false);
warnUser(user); warnUser(user, delay);
initTimer((long)(delay * 1000.0), target, chargeFor, cause); initTimer((long)(delay * 1000.0), target, chargeFor, cause);
teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10); teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
@ -303,13 +303,13 @@ public class Teleport implements Runnable, ITeleport
} }
cancel(false); cancel(false);
warnUser(otherUser); warnUser(otherUser, delay);
initTimer((long)(delay * 1000.0), otherUser, target, chargeFor, cause); initTimer((long)(delay * 1000.0), otherUser, target, chargeFor, cause);
teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10); teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
} }
private void warnUser(final IUser user) private void warnUser(final IUser user, final double delay)
{ {
Calendar c = new GregorianCalendar(); Calendar c = new GregorianCalendar();
c.add(Calendar.SECOND, (int)delay); c.add(Calendar.SECOND, (int)delay);
@ -331,8 +331,8 @@ public class Teleport implements Runnable, ITeleport
public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception public void warp(String warp, Trade chargeFor, TeleportCause cause) throws Exception
{ {
Location loc = ess.getWarps().getWarp(warp); Location loc = ess.getWarps().getWarp(warp);
teleport(new Target(loc), chargeFor, cause);
user.sendMessage(_("warpingTo", warp)); user.sendMessage(_("warpingTo", warp));
teleport(new Target(loc), chargeFor, cause);
} }
//The back function is a wrapper used to teleport a player /back to their previous location. //The back function is a wrapper used to teleport a player /back to their previous location.