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

Handle jail teleport locations slightly better.

This commit is contained in:
KHobbits 2012-08-28 02:06:11 +01:00
parent e045f9d983
commit c4e4235f30
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/EssentialsPlayerListener.java
View File

@ -122,7 +122,9 @@ public class EssentialsPlayerListener implements Listener
{
user.toggleVanished();
}
user.setLastLocation();
if (!user.isJailed()) {
user.setLastLocation();
}
user.updateActivity(false);
user.dispose();
}

16
Essentials/src/com/earth2me/essentials/User.java
View File

@ -11,6 +11,7 @@ import org.bukkit.ChatColor;
import org.bukkit.Location;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
public class User extends UserData implements Comparable<User>, IReplyTo, IUser
@ -176,7 +177,10 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
public boolean canAfford(final double cost, final boolean permcheck)
{
if (cost <= 0.0) { return true; }
if (cost <= 0.0)
{
return true;
}
final double mon = getMoney();
if (!permcheck || isAuthorized("essentials.eco.loan"))
{
@ -486,6 +490,13 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
}
catch (Exception ex)
{
try
{
getTeleport().respawn(null, TeleportCause.PLUGIN);
}
catch (Exception ex1)
{
}
}
return true;
}
@ -614,7 +625,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
{
invSee = set;
}
public boolean isEnderSee()
{
return enderSee;
@ -624,7 +635,6 @@ public class User extends UserData implements Comparable<User>, IReplyTo, IUser
{
enderSee = set;
}
private transient long teleportInvulnerabilityTimestamp = 0;
public void enableInvulnerabilityAfterTeleport()