mirror of
https://github.com/YouHaveTrouble/CommandWhitelist.git
synced 2026-05-12 06:26:57 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 9da87b2769 | |||
| 12ed028460 |
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>eu.endermite</groupId>
|
<groupId>eu.endermite</groupId>
|
||||||
<artifactId>CommandWhitelist</artifactId>
|
<artifactId>CommandWhitelist</artifactId>
|
||||||
<version>1.7.4</version>
|
<version>1.7.6</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<name>CommandWhitelist</name>
|
<name>CommandWhitelist</name>
|
||||||
|
|||||||
@@ -63,4 +63,11 @@ public class CommandsList {
|
|||||||
return last;
|
return last;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static String getCommandLabel(String cmd) {
|
||||||
|
String[] parts = cmd.split(" ");
|
||||||
|
if (parts[0].startsWith("/"))
|
||||||
|
parts[0] = parts[0].substring(1);
|
||||||
|
return parts[0];
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+30
@@ -19,6 +19,7 @@ public class LegacyPlayerTabChatCompleteListener {
|
|||||||
public static void protocol(CommandWhitelist plugin) {
|
public static void protocol(CommandWhitelist plugin) {
|
||||||
ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
|
ProtocolManager protocolManager = ProtocolLibrary.getProtocolManager();
|
||||||
tabCompleteServerBound(protocolManager, plugin);
|
tabCompleteServerBound(protocolManager, plugin);
|
||||||
|
tabCompleteClientBound(protocolManager, plugin);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void tabCompleteServerBound(ProtocolManager protocolManager, Plugin plugin) {
|
public static void tabCompleteServerBound(ProtocolManager protocolManager, Plugin plugin) {
|
||||||
@@ -52,4 +53,33 @@ public class LegacyPlayerTabChatCompleteListener {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void tabCompleteClientBound(ProtocolManager protocolManager, Plugin plugin) {
|
||||||
|
protocolManager.addPacketListener(new PacketAdapter(plugin, ListenerPriority.HIGHEST, PacketType.Play.Client.TAB_COMPLETE) {
|
||||||
|
@Override
|
||||||
|
public void onPacketReceiving(PacketEvent event) {
|
||||||
|
try {
|
||||||
|
Player player = event.getPlayer();
|
||||||
|
if (player.hasPermission("commandwhitelist.bypass")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
PacketContainer packet = event.getPacket();
|
||||||
|
String command = packet.getSpecificModifier(String.class).read(0);
|
||||||
|
String label = CommandsList.getCommandLabel(command);
|
||||||
|
List<String> commandList = CommandsList.getCommands(player);
|
||||||
|
if (command.equals("/"))
|
||||||
|
return;
|
||||||
|
for (String cmd : commandList) {
|
||||||
|
if (cmd.startsWith("/"+label+" "))
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
event.setCancelled(true);
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -13,7 +13,7 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
public class PlayerCommandPreProcessListener implements Listener {
|
public class PlayerCommandPreProcessListener implements Listener {
|
||||||
@EventHandler(priority = EventPriority.HIGHEST)
|
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||||
public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) {
|
public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandPreprocessEvent event) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
if (player.hasPermission("commandwhitelist.bypass"))
|
if (player.hasPermission("commandwhitelist.bypass"))
|
||||||
|
|||||||
+1
-1
@@ -8,7 +8,7 @@ import org.bukkit.event.Listener;
|
|||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
public class PlayerCommandSendListener implements Listener {
|
public class PlayerCommandSendListener implements Listener {
|
||||||
@EventHandler(priority = EventPriority.HIGHEST)
|
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||||
public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
|
public void PlayerCommandSendEvent(org.bukkit.event.player.PlayerCommandSendEvent event) {
|
||||||
Player player = event.getPlayer();
|
Player player = event.getPlayer();
|
||||||
if (player.hasPermission("commandwhitelist.bypass"))
|
if (player.hasPermission("commandwhitelist.bypass"))
|
||||||
|
|||||||
Reference in New Issue
Block a user