kaboomserver/extras
1
0
Fork 0
mirror of https://github.com/kaboomserver/extras.git synced 2025-02-05 06:02:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix for execute crash (#368)

Browse source
This commit is contained in:
VarLong 2025-01-26 15:42:37 +00:00 committed by GitHub
parent 445d230252
commit 531c27b11d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,8 +36,8 @@ public final class ServerCommand implements Listener {
return false; return false;
} }
private static String checkSelectors(final String[] arr) { private static String checkSelectors(final String[] arr, final int offset) {
final String[] args = Arrays.copyOfRange(arr, 1, arr.length); final String[] args = Arrays.copyOfRange(arr, offset, arr.length);
final String str = String.join(" ", args); final String str = String.join(" ", args);
final Matcher matcher = SELECTOR_PATTERN.matcher(str); final Matcher matcher = SELECTOR_PATTERN.matcher(str);
final long count = matcher.results().count(); final long count = matcher.results().count();
@ -79,6 +79,10 @@ public final class ServerCommand implements Listener {
switch (commandName) { switch (commandName) {
case "/minecraft:execute", "/execute" -> { case "/minecraft:execute", "/execute" -> {
if (arr.length >= 2) { if (arr.length >= 2) {
if (arr.length >= 3 && checkSelectors(arr, 2) != null) {
return "cancel";
}
for (int i = 1; i < arr.length; i++) { for (int i = 1; i < arr.length; i++) {
if ("summon".equalsIgnoreCase(arr[i])) { if ("summon".equalsIgnoreCase(arr[i])) {
return "cancel"; return "cancel";
@ -138,7 +142,7 @@ public final class ServerCommand implements Listener {
case "/minecraft:ban", "/ban", "/minecraft:kick", "/kick", case "/minecraft:ban", "/ban", "/minecraft:kick", "/kick",
"/minecraft:tell", "/tell", "/minecraft:msg", "/msg", "/minecraft:tell", "/tell", "/minecraft:msg", "/msg",
"/minecraft:w", "/w", "/minecraft:say", "/say" -> { "/minecraft:w", "/w", "/minecraft:say", "/say" -> {
return checkSelectors(arr); return checkSelectors(arr, 1);
} }
case "/minecraft:spreadplayers", "/spreadplayers" -> { case "/minecraft:spreadplayers", "/spreadplayers" -> {
if (arr.length == 7 && (arr[6].contains("@e") || arr[6].contains("@a"))) { if (arr.length == 7 && (arr[6].contains("@e") || arr[6].contains("@a"))) {