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

Remove User instance from Teleport class

Browse Source
This commit is contained in:
snowleo 2013-05-03 01:53:54 +02:00
parent ddb3b13931
commit aac9e4884d
1 changed files with 8 additions and 6 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

@ -42,8 +42,8 @@ public class Teleport implements Runnable, ITeleport
return location;
}
}
private IUser user;
private IUser teleportUser;
private final IUser user;
private String teleportUserName;
private int teleTimer = -1;
private long started; // time this task was initiated
private long tpdelay; // how long to delay the teleport
@ -74,7 +74,7 @@ public class Teleport implements Runnable, ITeleport
this.initX = Math.round(teleportUser.getLocation().getX() * MOVE_CONSTANT);
this.initY = Math.round(teleportUser.getLocation().getY() * MOVE_CONSTANT);
this.initZ = Math.round(teleportUser.getLocation().getZ() * MOVE_CONSTANT);
this.teleportUser = teleportUser;
this.teleportUserName = teleportUser.getName();
this.teleportTarget = target;
this.chargeFor = chargeFor;
this.cause = cause;
@ -82,7 +82,7 @@ public class Teleport implements Runnable, ITeleport
this.canMove = user.isAuthorized("essentials.teleport.timer.move");
teleTimer = ess.scheduleSyncRepeatingTask(this, 10, 10);
teleTimer = ess.scheduleSyncRepeatingTask(this, 20, 20);
}
@Override
@ -94,6 +94,8 @@ public class Teleport implements Runnable, ITeleport
cancel(false);
return;
}
IUser teleportUser = ess.getUser(this.teleportUserName);
if (teleportUser == null || !teleportUser.isOnline())
{
@ -216,9 +218,9 @@ public class Teleport implements Runnable, ITeleport
if (notifyUser)
{
user.sendMessage(_("pendingTeleportCancelled"));
if (teleportUser != user)
if (teleportUserName != null && !teleportUserName.equals(user.getName()))
{
teleportUser.sendMessage(_("pendingTeleportCancelled"));
ess.getUser(teleportUserName).sendMessage(_("pendingTeleportCancelled"));
}
}
}