Compare commits

..

8 Commits

Author SHA1 Message Date
youhavetrouble 023d9b57fe downgraded to 1.13 api version 2020-07-26 17:22:46 +02:00
youhavetrouble eb13e174e9 Merge remote-tracking branch 'origin/master' 2020-07-22 19:46:16 +02:00
youhavetrouble c2dd36d13b Merge remote-tracking branch 'origin/master' 2020-07-22 19:46:09 +02:00
youhavetrouble be4d8d21c0 Merge remote-tracking branch 'origin/master' 2020-07-22 19:45:36 +02:00
youhavetrouble 26b05aef7b improved command execution check 2020-07-22 19:45:27 +02:00
youhavetrouble 687fd0867b improved command execution check 2020-07-22 19:44:55 +02:00
youhavetrouble 733b556166 messed up priorities 2020-07-12 16:36:05 +02:00
youhavetrouble 97f0403b2e better command check 2020-07-11 17:46:55 +02:00
4 changed files with 9 additions and 8 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
<groupId>eu.endermite</groupId> <groupId>eu.endermite</groupId>
<artifactId>CommandWhitelist</artifactId> <artifactId>CommandWhitelist</artifactId>
<version>1.0-SNAPSHOT</version> <version>1.0.4</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>CommandWhitelist</name> <name>CommandWhitelist</name>
@@ -12,7 +12,7 @@ import java.util.Map;
public class PlayerCommandPreProcess implements Listener { public class PlayerCommandPreProcess implements Listener {
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.HIGHEST)
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();
@@ -20,12 +20,15 @@ public class PlayerCommandPreProcess implements Listener {
return; return;
} }
String command = event.getMessage(); String command = event.getMessage().toLowerCase();
for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) { for (Map.Entry<String, List<String>> s : CommandWhitelist.getConfigCache().getPermList().entrySet()) {
if (player.hasPermission("commandwhitelist.commands." + s.getKey())) { if (player.hasPermission("commandwhitelist.commands." + s.getKey())) {
for (String comm : s.getValue()) { for (String comm : s.getValue()) {
if (command.startsWith("/" + comm)) { comm = comm.toLowerCase();
if (command.equalsIgnoreCase("/"+comm))
return;
else if (command.startsWith("/" + comm + " ")) {
return; return;
} }
} }
@@ -33,7 +36,6 @@ public class PlayerCommandPreProcess implements Listener {
} }
event.setCancelled(true); event.setCancelled(true);
player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + " " + CommandWhitelist.getConfigCache().getCommandDenied())); player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelist.getConfigCache().getPrefix() + " " + CommandWhitelist.getConfigCache().getCommandDenied()));
} }
} }
@@ -5,12 +5,11 @@ import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import java.util.*; import java.util.*;
public class PlayerCommandSend implements Listener { public class PlayerCommandSend implements Listener {
@EventHandler(priority = EventPriority.HIGH) @EventHandler(priority = EventPriority.HIGHEST)
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();
+1 -1
View File
@@ -1,7 +1,7 @@
name: CommandWhitelist name: CommandWhitelist
version: ${project.version} version: ${project.version}
main: eu.endermite.commandwhitelist.CommandWhitelist main: eu.endermite.commandwhitelist.CommandWhitelist
api-version: 1.16 api-version: 1.13
authors: [YouHaveTrouble] authors: [YouHaveTrouble]
description: Control what commands players can use description: Control what commands players can use
permissions: permissions: