Fix group name when using wildcard group definitions.

1 files changed, 4 insertions, 3 deletions

diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java b/Essentials/src/com/earth2me/essentials/commands/Commandlist.java
index 2ccc46b02..d4f75df14 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandlist.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandlist.java
@@ -148,7 +148,7 @@ public class Commandlist extends EssentialsCommand
 			// If the group value is an asterisk, then skip it, and handle it later
 			if (groupValue.equals("*"))
 			{
-				asterisk.add(configGroup);
+				asterisk.add(oConfigGroup);
 				continue;
 			}
 
@@ -215,16 +215,17 @@ public class Commandlist extends EssentialsCommand
 		for (String onlineGroup : onlineGroups)
 		{
 			List<User> users = playerList.get(onlineGroup);
+			String groupName = asterisk.isEmpty() ? users.get(0).getGroup() : onlineGroup;
 
 			if (ess.getPermissionsHandler().getName().equals("ConfigPermissions"))
 			{
-				onlineGroup = _("connectedPlayers");
+				groupName = _("connectedPlayers");
 			}
 			if (users == null || users.isEmpty())
 			{
 				continue;
 			}
-			String groupName = users.get(0).getGroup();
+
 			sender.sendMessage(outputFormat(groupName, listUsers(users)));
 		}
 	}