1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-19 13:01:20 +02:00
This commit is contained in:
KHobbits
2013-03-29 03:01:53 +00:00
parent 5b5b873af9
commit 6fc5ce3af5

View File

@@ -99,8 +99,8 @@ public class Commandlist extends EssentialsCommand
{ {
throw new Exception(_("groupDoesNotExist")); throw new Exception(_("groupDoesNotExist"));
} }
return outputFormat(groupName, listUsers(users)); return outputFormat(groupName, listUsers(users));
} }
// Handle the merging of groups // Handle the merging of groups
@@ -171,12 +171,13 @@ public class Commandlist extends EssentialsCommand
outputUserList.addAll(matchedList); outputUserList.addAll(matchedList);
int limit = Integer.parseInt(groupValue); int limit = Integer.parseInt(groupValue);
if (matchedList.size() > limit) if (matchedList.size() > limit)
{ {
sender.sendMessage(outputFormat(oConfigGroup, _("groupNumber", matchedList.size(), commandLabel, Util.stripFormat(configGroup)))); sender.sendMessage(outputFormat(oConfigGroup, _("groupNumber", matchedList.size(), commandLabel, Util.stripFormat(configGroup))));
}
else
{
sender.sendMessage(outputFormat(oConfigGroup, listUsers(outputUserList)));
} }
else {
sender.sendMessage(outputFormat(oConfigGroup, listUsers(outputUserList)));
}
continue; continue;
} }
} }
@@ -200,7 +201,7 @@ public class Commandlist extends EssentialsCommand
{ {
List<User> asteriskUsers = new ArrayList<User>(); List<User> asteriskUsers = new ArrayList<User>();
for (String onlineGroup : onlineGroups) for (String onlineGroup : onlineGroups)
{ {
asteriskUsers.addAll(playerList.get(onlineGroup)); asteriskUsers.addAll(playerList.get(onlineGroup));
} }
for (String key : asterisk) for (String key : asterisk)
@@ -218,7 +219,7 @@ public class Commandlist extends EssentialsCommand
if (ess.getPermissionsHandler().getName().equals("ConfigPermissions")) if (ess.getPermissionsHandler().getName().equals("ConfigPermissions"))
{ {
onlineGroup = _("connectedPlayers"); onlineGroup = _("connectedPlayers");
} }
if (users == null || users.isEmpty()) if (users == null || users.isEmpty())
{ {
continue; continue;
@@ -263,6 +264,6 @@ public class Commandlist extends EssentialsCommand
outputString.append(_("listGroupTag", Util.replaceFormat(group))); outputString.append(_("listGroupTag", Util.replaceFormat(group)));
outputString.append(message); outputString.append(message);
outputString.setCharAt(0, Character.toTitleCase(outputString.charAt(0))); outputString.setCharAt(0, Character.toTitleCase(outputString.charAt(0)));
return outputString.toString(); return outputString.toString();
} }
} }