kaboomserver/extras
1
0
Fork 0
mirror of https://github.com/kaboomserver/extras.git synced 2024-05-13 00:11:21 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: kaboomserver:c6c3d03b5bf90833d30d15b7445e7f4c5eda3a60
Branches Tags
kaboomserver:master
...
compare: kaboomserver:3cc03ed801ada7cdb4ffc22ee88a6d818625abb1
Branches Tags
kaboomserver:master

2 commits
c6c3d03b5b ... 3cc03ed801

Author SHA1 Message Date
FlorianMichael 3cc03ed801
fixed long lines 2023-08-05 17:54:03 +02:00
FlorianMichael 5172357437
created more new lines 2023-08-05 16:56:45 +02:00
1 changed files with 11 additions and 6 deletions
Show stats Expand all files Collapse all files

17
src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java
View file

@ -23,9 +23,10 @@ public final class ServerCommand implements Listener {
private static final Pattern SELECTOR_PATTERN = Pattern.compile("(?>\\s)*@[aepsr](?>\\s)*");
private static final Logger LOGGER = JavaPlugin.getPlugin(Main.class).getLogger();
private static final String[] COMMANDS = { "execute", "clone", "fill", "forceload", "kick", "locate", "locatebiome",
"me", "msg", "reload", "save-all", "say", "spreadplayers", "stop", "summon", "teammsg", "teleport", "tell",
"tellraw", "tm", "tp", "w", "place", "fillbiome", "ride" };
private static final String[] COMMANDS = { "execute", "clone", "fill", "forceload", "kick",
"locate", "locatebiome", "me", "msg", "reload", "save-all", "say", "spreadplayers",
"stop", "summon", "teammsg", "teleport", "tell", "tellraw", "tm", "tp", "w", "place",
"fillbiome", "ride" };
public static boolean checkExecuteCommand(final String cmd) {
for (String command : COMMANDS) {
@ -109,7 +110,8 @@ public final class ServerCommand implements Listener {
" ", Arrays.copyOfRange(arr, 0, i + 1));
final String finalResult = checkCommand(sender,
pureExecute + " " + result, isConsoleCommand, depth + 1);
return Objects.requireNonNullElseGet(finalResult, () -> pureExecute + " " + result);
return Objects.requireNonNullElseGet(finalResult,
() -> pureExecute + " " + result);
}
}
}
@ -138,7 +140,9 @@ public final class ServerCommand implements Listener {
}
}
}
case "/minecraft:ban", "/ban", "/minecraft:kick", "/kick", "/minecraft:tell", "/tell", "/minecraft:msg", "/msg", "/minecraft:w", "/w", "/minecraft:say", "/say" -> {
case "/minecraft:ban", "/ban", "/minecraft:kick", "/kick",
"/minecraft:tell", "/tell", "/minecraft:msg", "/msg",
"/minecraft:w", "/w", "/minecraft:say", "/say" -> {
return checkSelectors(arr);
}
case "/minecraft:spreadplayers", "/spreadplayers" -> {
@ -157,7 +161,8 @@ public final class ServerCommand implements Listener {
return String.join(" ", arr);
}
}
case "/viaversion:viaver", "/viaversion:viaversion", "/viaversion:vvbukkit", "/viaver", "/viaversion", "/vvbukkit" -> {
case "/viaversion:viaver", "/viaversion:viaversion", "/viaversion:vvbukkit",
"/viaver", "/viaversion", "/vvbukkit" -> {
if (arr.length >= 2
&& "debug".equalsIgnoreCase(arr[1])) {
return "cancel";