minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-10-05 02:21:38 +02:00
Code Issues Releases Wiki Activity

Merge gravy's pull and reformat code

Browse Source
This commit is contained in:
KHobbits
2012-12-31 02:28:52 +00:00
parent a6b83ca260
commit 8661927599
322 changed files with 2652 additions and 2772 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,16 +16,16 @@ public class Commandtpahere extends EssentialsCommand
throw new NotEnoughArgumentsException();
}
final IUser player = ess.getUserMap().matchUserExcludingHidden(args[0], user.getPlayer());
if (!player.getData().isTeleportEnabled())
{
throw new Exception(_("teleportDisabled", player.getPlayer().getDisplayName()));
}
ISettings settings = ess.getSettings();
if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions()
&& !Permissions.WORLD.isAuthorized(user, user.getPlayer().getWorld().getName()))
if (user.getPlayer().getWorld() != player.getPlayer().getWorld() && settings.getData().getGeneral().isWorldTeleportPermissions() && !Permissions.WORLD.isAuthorized(
user, user.getPlayer().getWorld().getName()))
{
throw new Exception(_("noPerm", "essentials.world." + user.getPlayer().getWorld().getName()));
}