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

Fix Essentials /sethome to more strictly obey home limits.

Browse source
This commit is contained in:
KHobbits 2012-09-15 19:55:12 +01:00
parent cc0a65bace
commit a2886d76d2
4 changed files with 48 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

70
Essentials/src/com/earth2me/essentials/commands/Commandsethome.java
View file

@ -3,6 +3,7 @@ package com.earth2me.essentials.commands;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.User;
import java.util.Locale;
import org.bukkit.Location;
import org.bukkit.Server;
@ -16,6 +17,10 @@ public class Commandsethome extends EssentialsCommand
@Override
public void run(final Server server, final User user, final String commandLabel, String[] args) throws Exception
{
User usersHome = user;
String name = "home";
final Location location = user.getLocation();
if (args.length > 0)
{
//Allowing both formats /sethome khobbits house | /sethome khobbits:house
@ -27,33 +32,13 @@ public class Commandsethome extends EssentialsCommand
if (args.length < 2)
{
if (user.isAuthorized("essentials.sethome.multiple"))
{
if ("bed".equals(args[0].toLowerCase(Locale.ENGLISH)))
{
throw new NotEnoughArgumentsException();
}
if ((user.isAuthorized("essentials.sethome.multiple.unlimited")) || (user.getHomes().size() < ess.getSettings().getHomeLimit(user))
|| (user.getHomes().contains(args[0].toLowerCase(Locale.ENGLISH))))
{
user.setHome(args[0].toLowerCase(Locale.ENGLISH));
}
else
{
throw new Exception(_("maxHomes", ess.getSettings().getHomeLimit(user)));
}
}
else
{
throw new Exception(_("maxHomes", 1));
}
name = args[0].toLowerCase(Locale.ENGLISH);
}
else
{
if (user.isAuthorized("essentials.sethome.others"))
{
User usersHome = ess.getUser(ess.getServer().getPlayer(args[0]));
usersHome = ess.getUser(ess.getServer().getPlayer(args[0]));
if (usersHome == null)
{
usersHome = ess.getOfflineUser(args[0]);
@ -62,24 +47,41 @@ public class Commandsethome extends EssentialsCommand
{
throw new Exception(_("playerNotFound"));
}
String name = args[1].toLowerCase(Locale.ENGLISH);
if (!user.isAuthorized("essentials.sethome.multiple"))
{
name = "home";
}
if ("bed".equals(name.toLowerCase(Locale.ENGLISH)))
{
throw new NotEnoughArgumentsException();
}
usersHome.setHome(name, user.getLocation());
name = args[1].toLowerCase(Locale.ENGLISH);
}
}
}
else
if (checkHomeLimit(user, usersHome, name))
{
user.setHome();
name = "home";
}
if ("bed".equals(name))
{
throw new NotEnoughArgumentsException();
}
usersHome.setHome(name, location);
user.sendMessage(_("homeSet", user.getLocation().getWorld().getName(), user.getLocation().getBlockX(), user.getLocation().getBlockY(), user.getLocation().getBlockZ()));
}
private boolean checkHomeLimit(final User user, final User usersHome, String name) throws Exception
{
if (!user.isAuthorized("essentials.sethome.multiple.unlimited"))
{
int limit = ess.getSettings().getHomeLimit(user);
if (usersHome.getHomes().size() == limit && usersHome.getHomes().contains(name))
{
return false;
}
if (usersHome.getHomes().size() >= limit)
{
throw new Exception(_("maxHomes", ess.getSettings().getHomeLimit(user)));
}
if (limit == 1)
{
return true;
}
}
return false;
}
}