Skip to content

Small fixes for 1.21.4 #374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 7, 2025
Merged

Small fixes for 1.21.4 #374

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
971879d
feat: update blocked execute commands list
amyavi Mar 30, 2025
a1b6aa3
feat: remove /scissors reload block
amyavi Mar 30, 2025
bc7e0b0
perf: optimize execute command checking
amyavi Mar 30, 2025
353516a
fix: update selector pattern for 1.21.4
amyavi Mar 30, 2025
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
30 changes: 8 additions & 22 deletions src/main/java/pw/kaboom/extras/modules/server/ServerCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package pw.kaboom.extras.modules.server;

import com.google.common.collect.ImmutableSet;
import org.bukkit.block.CommandBlock;
import org.bukkit.command.BlockCommandSender;
import org.bukkit.command.CommandSender;
Expand All @@ -12,29 +13,20 @@

import java.util.Arrays;
import java.util.Objects;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

public final class ServerCommand implements Listener {
private static final Pattern SELECTOR_PATTERN = Pattern.compile("(?>\\s)*@[aepsr](?>\\s)*");
private static final Pattern SELECTOR_PATTERN = Pattern.compile("(?>\\s)*@[aenprs](?>\\s)*");
private static final Logger LOGGER = JavaPlugin.getPlugin(Main.class).getLogger();

private static final String[] COMMANDS = {"clone", "datapack", "fill", "forceload",
"give", "kick", "locate", "locatebiome", "me", "msg", "reload", "save-all",
"say", "spawnpoint", "spreadplayers", "stop", "summon", "teammsg",
"teleport", "tell", "tellraw", "tm", "tp", "w", "place", "fillbiome", "ride",
"tick", "jfr"};

public static boolean checkExecuteCommand(final String cmd) {
for (String command : COMMANDS) {
if (command.equalsIgnoreCase(cmd)) {
return true;
}
}
return false;
}
private static final Set<String> BLOCKED_EXECUTE_COMMANDS = ImmutableSet.of(
"clone", "fill", "give", "kick", "locate", "me", "msg", "save-all", "say",
"spawnpoint", "spreadplayers", "summon", "teammsg", "teleport", "tell", "tellraw",
"tm", "tp", "w", "fillbiome", "ride");

private static String checkSelectors(final String[] arr, final int offset) {
final String[] args = Arrays.copyOfRange(arr, offset, arr.length);
Expand Down Expand Up @@ -93,7 +85,7 @@ public static String checkCommand(final CommandSender sender, final String comma
if (i + 1 == arr.length) {
break;
}
if (checkExecuteCommand(arr[i + 1])) {
if (BLOCKED_EXECUTE_COMMANDS.contains(arr[i + 1])) {
return "cancel";
}
final String[] executeCommand = Arrays.copyOfRange(
Expand Down Expand Up @@ -167,12 +159,6 @@ public static String checkCommand(final CommandSender sender, final String comma
return "cancel";
}
}
case "/scissors:scissors", "/scissors" -> {
if (arr.length >= 2
&& "reload".equalsIgnoreCase(arr[1])) {
return "cancel";
}
}
case "/geyser-spigot:geyser", "/geyser" -> {
if (arr.length >= 2
&& "dump".equalsIgnoreCase(arr[1])) {
Expand Down