TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-07-13 01:04:25 +00:00
Code Issues Projects Releases Wiki Activity

Continuing code cleanup

Browse source
This commit is contained in:
KHobbits 2011-11-18 19:30:05 +00:00
parent fc00ff471d
commit cd9ea163e4
28 changed files with 223 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Essentials/src/com/earth2me/essentials/commands/Commandtp.java
View file

@ -16,7 +16,7 @@ public class Commandtp extends EssentialsCommand
}
@Override
public void run(Server server, User user, String commandLabel, String[] args) throws Exception
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception
{
switch (args.length)
{
@ -24,25 +24,25 @@ public class Commandtp extends EssentialsCommand
throw new NotEnoughArgumentsException();
case 1:
User p = getPlayer(server, args, 0);
if (!p.isTeleportEnabled())
final User player = getPlayer(server, args, 0);
if (!player.isTeleportEnabled())
{
throw new Exception(Util.format("teleportDisabled", p.getDisplayName()));
throw new Exception(Util.format("teleportDisabled", player.getDisplayName()));
}
user.sendMessage(Util.i18n("teleporting"));
Trade charge = new Trade(this.getName(), ess);
final Trade charge = new Trade(this.getName(), ess);
charge.isAffordableFor(user);
user.getTeleport().teleport(p, charge);
user.getTeleport().teleport(player, charge);
throw new NoChargeException();
case 2:
default:
if (!user.isAuthorized("essentials.tpohere"))
{
throw new Exception("You need access to /tpohere to teleport other players.");
}
user.sendMessage(Util.i18n("teleporting"));
User target = getPlayer(server, args, 0);
User toPlayer = getPlayer(server, args, 1);
final User target = getPlayer(server, args, 0);
final User toPlayer = getPlayer(server, args, 1);
target.getTeleport().now(toPlayer, false);
target.sendMessage(Util.format("teleportAtoB", user.getDisplayName(), toPlayer.getDisplayName()));
break;
@ -50,7 +50,7 @@ public class Commandtp extends EssentialsCommand
}
@Override
public void run(Server server, CommandSender sender, String commandLabel, String[] args) throws Exception
public void run(final Server server, final CommandSender sender, final String commandLabel, final String[] args) throws Exception
{
if (args.length < 2)
{
@ -58,8 +58,8 @@ public class Commandtp extends EssentialsCommand
}
sender.sendMessage(Util.i18n("teleporting"));
User target = getPlayer(server, args, 0);
User toPlayer = getPlayer(server, args, 1);
final User target = getPlayer(server, args, 0);
final User toPlayer = getPlayer(server, args, 1);
target.getTeleport().now(toPlayer, false);
target.sendMessage(Util.format("teleportAtoB", Console.NAME, toPlayer.getDisplayName()));
}