1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-09-25 13:49:12 +02:00

Let's have a sorted mob list.

This commit is contained in:
KHobbits
2012-11-12 22:57:02 +00:00
parent 74ff3cbbd4
commit 8fbd8f0266

View File

@@ -1,6 +1,5 @@
package net.ess3; package net.ess3;
import static net.ess3.I18n._; import static net.ess3.I18n._;
import net.ess3.api.IEssentials; import net.ess3.api.IEssentials;
import net.ess3.api.ISettings; import net.ess3.api.ISettings;
@@ -12,10 +11,7 @@ import net.ess3.permissions.Permissions;
import net.ess3.user.User; import net.ess3.user.User;
import net.ess3.utils.LocationUtil; import net.ess3.utils.LocationUtil;
import net.ess3.utils.Util; import net.ess3.utils.Util;
import java.util.HashSet; import java.util.*;
import java.util.Locale;
import java.util.Random;
import java.util.Set;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.bukkit.DyeColor; import org.bukkit.DyeColor;
import org.bukkit.Location; import org.bukkit.Location;
@@ -25,7 +21,6 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.*; import org.bukkit.entity.*;
import org.bukkit.material.Colorable; import org.bukkit.material.Colorable;
public class SpawnMob public class SpawnMob
{ {
private static transient Pattern colon = Pattern.compile(":"); private static transient Pattern colon = Pattern.compile(":");
@@ -34,7 +29,7 @@ public class SpawnMob
public static String mobList(final IUser user) throws NotEnoughArgumentsException public static String mobList(final IUser user) throws NotEnoughArgumentsException
{ {
final Set<String> mobList = LivingEntities.getLivingEntityList(); final Set<String> mobList = LivingEntities.getLivingEntityList();
final Set<String> availableList = new HashSet<String>(); final List<String> availableList = new ArrayList<String>();
for (String mob : mobList) for (String mob : mobList)
{ {
if (Permissions.SPAWNMOB.isAuthorized(user, mob)) if (Permissions.SPAWNMOB.isAuthorized(user, mob))
@@ -46,6 +41,8 @@ public class SpawnMob
{ {
availableList.add(_("none")); availableList.add(_("none"));
} }
Collections.sort(availableList);
return Util.joinList(availableList); return Util.joinList(availableList);
} }