Bug fixes with /list

hsyyid · Feb 22, 2016 · 0b11fac · 0b11fac
1 parent cc180c1
commit 0b11fac
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -9,7 +9,7 @@ plugins {
 
 group = "io.github.hsyyid"
 archivesBaseName = "EssentialCmds"
-version = '7.5c'
+version = '7.5d'
 
 apply plugin: 'net.ellune.blossom'
 

diff --git a/src/main/java/io/github/hsyyid/essentialcmds/cmdexecutors/ListExecutor.java b/src/main/java/io/github/hsyyid/essentialcmds/cmdexecutors/ListExecutor.java
@@ -58,7 +58,6 @@ public CommandResult execute(CommandSource src, CommandContext ctx) throws Comma
 		if (optPermissionService.isPresent())
 		{
 			PermissionService permissionService = optPermissionService.get();
-			List<UUID> listedPlayers = Lists.newArrayList();
 
 			for (Subject group : permissionService.getGroupSubjects().getAllSubjects())
 			{
@@ -69,11 +68,19 @@ public CommandResult execute(CommandSource src, CommandContext ctx) throws Comma
 				while (itr.hasNext())
 				{
 					Subject user = itr.next();
-					Optional<Player> optPlayer = Sponge.getServer().getPlayer(UUID.fromString(user.getIdentifier()));
+					Optional<Player> optPlayer = Optional.empty();
 
-					if (optPlayer.isPresent() && !listedPlayers.contains(optPlayer.get().getUniqueId()))
+					try
+					{
+						optPlayer = Sponge.getServer().getPlayer(UUID.fromString(user.getIdentifier()));
+					}
+					catch (IllegalArgumentException e)
+					{
+						optPlayer = Sponge.getServer().getPlayer(user.getIdentifier());
+					}
+
+					if (optPlayer.isPresent())
 					{
-						listedPlayers.add(optPlayer.get().getUniqueId());
 						onlineUsers.add(optPlayer.get().getName());
 					}
 				}