diff options
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/UserData.java | 12 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandsethome.java | 2 |
2 files changed, 1 insertions, 13 deletions
diff --git a/Essentials/src/com/earth2me/essentials/UserData.java b/Essentials/src/com/earth2me/essentials/UserData.java index 533b58acf..5686e0439 100644 --- a/Essentials/src/com/earth2me/essentials/UserData.java +++ b/Essentials/src/com/earth2me/essentials/UserData.java @@ -4,7 +4,6 @@ import static com.earth2me.essentials.I18n._; import java.io.File; import java.util.*; import org.bukkit.Location; -import org.bukkit.Material; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -150,17 +149,6 @@ public abstract class UserData extends PlayerExtension implements IConf return new ArrayList<String>(homes.keySet()); } - public int getHomeCount() - { - int count = getHomes().size(); - Location bed = getBedSpawnLocation(); - if (bed != null && bed.getBlock().getType() == Material.BED_BLOCK) - { - count++; - } - return count; - } - public void setHome(String name, Location loc) { //Invalid names will corrupt the yaml diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java b/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java index a4bdb08ad..f622094d2 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsethome.java @@ -33,7 +33,7 @@ public class Commandsethome extends EssentialsCommand { throw new NotEnoughArgumentsException(); } - if ((user.isAuthorized("essentials.sethome.multiple.unlimited")) || (user.getHomeCount() < ess.getSettings().getHomeLimit(user)) + 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)); |