summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-11-12 22:57:02 +0000
committerKHobbits <rob@khobbits.co.uk>2012-11-12 22:57:02 +0000
commit8fbd8f02668ad6ccb2540fc1b3e065dd0e6fa5ab (patch)
tree7b64b7152aafaa92593bd0d496541b44860dad6d
parent74ff3cbbd44210e16209a5d54df48fe8f3a48f4b (diff)
downloadEssentials-8fbd8f02668ad6ccb2540fc1b3e065dd0e6fa5ab.tar
Essentials-8fbd8f02668ad6ccb2540fc1b3e065dd0e6fa5ab.tar.gz
Essentials-8fbd8f02668ad6ccb2540fc1b3e065dd0e6fa5ab.tar.lz
Essentials-8fbd8f02668ad6ccb2540fc1b3e065dd0e6fa5ab.tar.xz
Essentials-8fbd8f02668ad6ccb2540fc1b3e065dd0e6fa5ab.zip
Let's have a sorted mob list.
-rw-r--r--Essentials/src/net/ess3/SpawnMob.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/Essentials/src/net/ess3/SpawnMob.java b/Essentials/src/net/ess3/SpawnMob.java
index 198efba9b..90e220e06 100644
--- a/Essentials/src/net/ess3/SpawnMob.java
+++ b/Essentials/src/net/ess3/SpawnMob.java
@@ -1,6 +1,5 @@
package net.ess3;
-
import static net.ess3.I18n._;
import net.ess3.api.IEssentials;
import net.ess3.api.ISettings;
@@ -12,10 +11,7 @@ import net.ess3.permissions.Permissions;
import net.ess3.user.User;
import net.ess3.utils.LocationUtil;
import net.ess3.utils.Util;
-import java.util.HashSet;
-import java.util.Locale;
-import java.util.Random;
-import java.util.Set;
+import java.util.*;
import java.util.regex.Pattern;
import org.bukkit.DyeColor;
import org.bukkit.Location;
@@ -25,7 +21,6 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.*;
import org.bukkit.material.Colorable;
-
public class SpawnMob
{
private static transient Pattern colon = Pattern.compile(":");
@@ -34,7 +29,7 @@ public class SpawnMob
public static String mobList(final IUser user) throws NotEnoughArgumentsException
{
final Set<String> mobList = LivingEntities.getLivingEntityList();
- final Set<String> availableList = new HashSet<String>();
+ final List<String> availableList = new ArrayList<String>();
for (String mob : mobList)
{
if (Permissions.SPAWNMOB.isAuthorized(user, mob))
@@ -46,6 +41,8 @@ public class SpawnMob
{
availableList.add(_("none"));
}
+
+ Collections.sort(availableList);
return Util.joinList(availableList);
}