minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-10-04 18:11:43 +02:00
Code Issues Releases Wiki Activity

Updates for new user object and other fixes

Browse Source
This commit is contained in:
ementalo
2012-08-27 01:00:34 +01:00
parent 7aff52ccec
commit 53cffa7556
43 changed files with 178 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Essentials/src/net/ess3/commands/Commandtpahere.java
View File

@@ -22,18 +22,18 @@ public class Commandtpahere extends EssentialsCommand
player.acquireReadLock();
if (!player.getData().isTeleportEnabled())
{
throw new Exception(_("teleportDisabled", player.getDisplayName()));
throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
}
@Cleanup
ISettings settings = ess.getSettings();
settings.acquireReadLock();
if (user.getWorld() != player.getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
&& !WorldPermissions.getPermission(user.getWorld().getName()).isAuthorized(user))
if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
&& !WorldPermissions.getPermission(user.getPlayer().getWorld().getName()).isAuthorized(user))
{
throw new Exception(_("noPerm", "essentials.world." + user.getWorld().getName()));
throw new Exception(_("noPerm", "essentials.world." + user.getPlayer().getWorld().getName()));
}
player.requestTeleport(user, true);
player.sendMessage(_("teleportHereRequest", user.getDisplayName()));
player.sendMessage(_("teleportHereRequest", user.getPlayer().getDisplayName()));
player.sendMessage(_("typeTpaccept"));
int tpaAcceptCancellation = 0;
{
@@ -43,6 +43,6 @@ public class Commandtpahere extends EssentialsCommand
{
player.sendMessage(_("teleportRequestTimeoutInfo", tpaAcceptCancellation));
}
user.sendMessage(_("requestSent", player.getDisplayName()));
user.sendMessage(_("requestSent", player.getPlayer().getDisplayName()));
}
}