TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-10 22:35:35 +00:00
Code Issues Projects Releases Wiki Activity

Command cleanup

Browse source
This commit is contained in:
KHobbits 2011-11-18 12:06:59 +00:00
parent e5c77c1aeb
commit e54d73704e
36 changed files with 165 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Essentials/src/com/earth2me/essentials/commands/Commandhome.java
View file

@ -15,11 +15,11 @@ public class Commandhome 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
{
Trade charge = new Trade(this.getName(), ess);
final Trade charge = new Trade(this.getName(), ess);
charge.isAffordableFor(user);
User u = user;
User player = user;
String homeName = "";
String[] nameParts;
if (args.length > 0)
@ -31,7 +31,7 @@ public class Commandhome extends EssentialsCommand
}
else
{
u = getPlayer(server, nameParts[0].split(" "), 0, true);
player = getPlayer(server, nameParts[0].split(" "), 0, true);
if (nameParts.length > 1)
{
homeName = nameParts[1];
@ -40,22 +40,22 @@ public class Commandhome extends EssentialsCommand
}
try
{
user.getTeleport().home(u, homeName.toLowerCase(), charge);
user.getTeleport().home(player, homeName.toLowerCase(), charge);
}
catch (NotEnoughArgumentsException e)
{
List<String> homes = u.getHomes();
if (homes.isEmpty() && u.equals(user) && ess.getSettings().spawnIfNoHome())
final List<String> homes = player.getHomes();
if (homes.isEmpty() && player.equals(user) && ess.getSettings().spawnIfNoHome())
{
user.getTeleport().respawn(ess.getSpawn(), charge);
user.getTeleport().respawn(ess.getSpawn(), charge);
}
else if (homes.isEmpty())
{
throw new Exception(u == user ? Util.i18n("noHomeSet") : Util.i18n("noHomeSetPlayer"));
throw new Exception(player == user ? Util.i18n("noHomeSet") : Util.i18n("noHomeSetPlayer"));
}
else if (homes.size() == 1 && u.equals(user))
else if (homes.size() == 1 && player.equals(user))
{
user.getTeleport().home(u, homes.get(0), charge);
user.getTeleport().home(player, homes.get(0), charge);
}
else
{