mirror of
https://github.com/YouHaveTrouble/CommandWhitelist.git
synced 2026-05-12 06:26:57 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 568e7a5ca4 | |||
| 7cb94cce4b |
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>eu.endermite.commandwhitelist</groupId>
|
||||
<artifactId>CommandWhitelist</artifactId>
|
||||
<version>2.2.2</version>
|
||||
<version>2.2.3</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>Bukkit</artifactId>
|
||||
|
||||
+1
-2
@@ -27,8 +27,7 @@ public class PacketCommandSendListener {
|
||||
@Override
|
||||
public void onPacketSending(PacketEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if (player.hasPermission(CWPermission.BYPASS.permission())) return;
|
||||
|
||||
if (!event.isPlayerTemporary() && player.hasPermission(CWPermission.BYPASS.permission())) return;
|
||||
HashSet<String> commandList = CommandWhitelistBukkit.getCommands(player);
|
||||
PacketContainer packet = event.getPacket();
|
||||
RootCommandNode<?> node = (RootCommandNode<?>) packet.getModifier().getValues().get(0);
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>eu.endermite.commandwhitelist</groupId>
|
||||
<artifactId>CommandWhitelist</artifactId>
|
||||
<version>2.2.2</version>
|
||||
<version>2.2.3</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>Common</artifactId>
|
||||
|
||||
+6
-4
@@ -17,15 +17,17 @@ public class CommandUtil {
|
||||
public static List<String> filterSuggestions(String buffer, Collection<String> suggestions, Collection<String> blockedSubCommands) {
|
||||
if (buffer.startsWith("/"))
|
||||
buffer = buffer.substring(1);
|
||||
List<String> suggestionsList = new ArrayList<>(suggestions);
|
||||
if (suggestions.isEmpty() || blockedSubCommands.isEmpty()) return suggestionsList;
|
||||
for (String s : blockedSubCommands) {
|
||||
String slast = getLastArgument(s);
|
||||
String scommand = cutLastArgument(s);
|
||||
if (buffer.startsWith(scommand)) {
|
||||
while (suggestions.contains(slast))
|
||||
suggestions.remove(slast);
|
||||
String slast = getLastArgument(s);
|
||||
while (suggestionsList.contains(slast))
|
||||
suggestionsList.remove(slast);
|
||||
}
|
||||
}
|
||||
return new ArrayList<>(suggestions);
|
||||
return suggestionsList;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>eu.endermite.commandwhitelist</groupId>
|
||||
<artifactId>CommandWhitelist</artifactId>
|
||||
<version>2.2.2</version>
|
||||
<version>2.2.3</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>Velocity</artifactId>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<parent>
|
||||
<groupId>eu.endermite.commandwhitelist</groupId>
|
||||
<artifactId>CommandWhitelist</artifactId>
|
||||
<version>2.2.2</version>
|
||||
<version>2.2.3</version>
|
||||
</parent>
|
||||
|
||||
<artifactId>Waterfall</artifactId>
|
||||
|
||||
+1
-3
@@ -13,15 +13,13 @@ public class BungeeTabcompleteListener implements Listener {
|
||||
public void onTabcomplete(net.md_5.bungee.api.event.TabCompleteEvent event) {
|
||||
if (!(event.getReceiver() instanceof ProxiedPlayer)) return;
|
||||
ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
|
||||
if (event.getSuggestions().isEmpty()) return;
|
||||
if (player.hasPermission(CWPermission.BYPASS.permission())) return;
|
||||
|
||||
CommandUtil.filterSuggestions(
|
||||
event.getCursor(),
|
||||
event.getSuggestions(),
|
||||
CommandWhitelistWaterfall.getSuggestions(player)
|
||||
);
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
+1
-2
@@ -15,8 +15,7 @@ public class WaterfallDefineCommandsListener implements Listener {
|
||||
public void onProxyDefineCommandsEvent(io.github.waterfallmc.waterfall.event.ProxyDefineCommandsEvent event) {
|
||||
if (event.getReceiver() instanceof ProxiedPlayer) {
|
||||
ProxiedPlayer player = (ProxiedPlayer) event.getReceiver();
|
||||
if (player.hasPermission(CWPermission.BYPASS.permission()))
|
||||
return;
|
||||
if (player.hasPermission(CWPermission.BYPASS.permission())) return;
|
||||
HashMap<String, Command> commandHashMap = new HashMap<>();
|
||||
CommandWhitelistWaterfall.getCommands(player).forEach(cmdName ->
|
||||
CommandWhitelistWaterfall.getPlugin().getProxy().getPluginManager().getCommands()
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
name: CommandWhitelist
|
||||
author: YouHaveTrouble
|
||||
version: ${project.version}
|
||||
main: eu.endermite.commandwhitelist.waterfall.CommandWhitelistWaterfall
|
||||
description: You decide what commands players can use or tab complete on your server!
|
||||
|
||||
Reference in New Issue
Block a user