Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
}

group = "com.bitaspire"
version = "1.2.3"
version = "1.2.5"

repositories {
mavenLocal()
Expand Down
32 changes: 19 additions & 13 deletions src/main/java/com/bitaspire/cyberlevels/command/CLVTabComplete.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ public class CLVTabComplete implements TabCompleter {
private static final Set<String> MUTATION_COMMANDS = Collections.unmodifiableSet(new HashSet<>(
Arrays.asList("addexp", "setexp", "removeexp", "addlevel", "setlevel", "removelevel")
));
private static final List<String> CONSOLE_COMMANDS = Collections.unmodifiableList(
Arrays.asList("about", "reload", "addexp", "setexp", "removeexp", "addlevel", "setlevel", "removelevel", "purge")
);
private static final Map<String, String> COMMAND_PERMISSIONS = new LinkedHashMap<>();

static {
Expand All @@ -48,13 +51,13 @@ public class CLVTabComplete implements TabCompleter {
COMMAND_PERMISSIONS.put("list", ADMIN_PREFIX + "list");
COMMAND_PERMISSIONS.put("purge", ADMIN_PREFIX + "purge");

COMMAND_PERMISSIONS.put("addExp", ADMIN_PREFIX + "exp.add");
COMMAND_PERMISSIONS.put("setExp", ADMIN_PREFIX + "exp.set");
COMMAND_PERMISSIONS.put("removeExp", ADMIN_PREFIX + "exp.remove");
COMMAND_PERMISSIONS.put("addexp", ADMIN_PREFIX + "exp.add");
COMMAND_PERMISSIONS.put("setexp", ADMIN_PREFIX + "exp.set");
COMMAND_PERMISSIONS.put("removeexp", ADMIN_PREFIX + "exp.remove");

COMMAND_PERMISSIONS.put("addLevel", ADMIN_PREFIX + "levels.add");
COMMAND_PERMISSIONS.put("setLevel", ADMIN_PREFIX + "levels.set");
COMMAND_PERMISSIONS.put("removeLevel", ADMIN_PREFIX + "levels.remove");
COMMAND_PERMISSIONS.put("addlevel", ADMIN_PREFIX + "levels.add");
COMMAND_PERMISSIONS.put("setlevel", ADMIN_PREFIX + "levels.set");
COMMAND_PERMISSIONS.put("removelevel", ADMIN_PREFIX + "levels.remove");
}

private final CyberLevels main;
Expand All @@ -73,26 +76,29 @@ public class CLVTabComplete implements TabCompleter {
*/
@Override
public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
if (!(sender instanceof Player)) return Collections.emptyList();
Player player = (Player) sender;
Player player = sender instanceof Player ? (Player) sender : null;

if (args.length == 1) {
List<String> available = new ArrayList<>();
COMMAND_PERMISSIONS.forEach((cmd, perm) -> {
if (player.hasPermission(perm)) available.add(cmd);
});
if (player == null) {
available.addAll(CONSOLE_COMMANDS);
} else {
COMMAND_PERMISSIONS.forEach((cmd, perm) -> {
if (player.hasPermission(perm)) available.add(cmd);
});
}
return partialMatch(args[0], available);
}

if (args.length == 2) {
switch (args[0].toLowerCase()) {
case "info":
if (player.hasPermission(ADMIN_PREFIX + "list"))
if (player != null && player.hasPermission(ADMIN_PREFIX + "list"))
return partialMatch(args[1], getPlayerNames());
break;

case "purge":
if (player.hasPermission(ADMIN_PREFIX + "purge"))
if (player == null || player.hasPermission(ADMIN_PREFIX + "purge"))
return partialMatch(args[1], getPlayerNames());
break;

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ config:
load-offline-users: true

# Should adding levels give rewards?
add-level-reward: false
add-level-reward: true

# Should getting rewards multiple times per
# level be prevented?
Expand Down
Loading