YouHaveTrouble/CommandWhitelist
1
0
Fork 0
mirror of https://github.com/YouHaveTrouble/CommandWhitelist.git synced 2026-05-11 22:16:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved code quality

Browse Source
This commit is contained in:
YouHaveTrouble
2020-08-29 11:40:13 +02:00
parent cccdc6b514
commit e08d9e6f4d
3 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/eu/endermite/commandwhitelist/bungee/listeners/BungeeChatEventListener.java
+34 -26
View File
@@ -5,6 +5,7 @@ import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.connection.ProxiedPlayer;
import net.md_5.bungee.api.plugin.Listener; import net.md_5.bungee.api.plugin.Listener;
import net.md_5.bungee.event.EventHandler; import net.md_5.bungee.event.EventHandler;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -13,34 +14,41 @@ public class BungeeChatEventListener implements Listener {
@EventHandler @EventHandler
public void onChatEvent(net.md_5.bungee.api.event.ChatEvent event) { public void onChatEvent(net.md_5.bungee.api.event.ChatEvent event) {
if (!event.isCancelled() && event.getSender() instanceof ProxiedPlayer) { if (event.isCancelled())
ProxiedPlayer player = (ProxiedPlayer) event.getSender(); return;
if (event.isProxyCommand()) {
if (player.hasPermission("commandwhitelist.bypass")) { if (!(event.getSender() instanceof ProxiedPlayer))
return; return;
}
String command = event.getMessage().toLowerCase(); if (!event.isProxyCommand())
boolean found = false; return;
for (Map.Entry<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
if (player.hasPermission("commandwhitelist.commands." + s.getKey())) { ProxiedPlayer player = (ProxiedPlayer) event.getSender();
for (String comm : s.getValue()) {
comm = comm.toLowerCase(); if (player.hasPermission("commandwhitelist.bypass")) {
if (command.equalsIgnoreCase("/"+comm)) { return;
found = true; }
break;
} String command = event.getMessage().toLowerCase();
else if (command.startsWith("/" + comm + " ")) { boolean found = false;
found = true; for (Map.Entry<String, List<String>> s : CommandWhitelistBungee.getConfigCache().getPermList().entrySet()) {
break; if (!player.hasPermission("commandwhitelist.commands." + s.getKey()))
} continue;
}
} for (String comm : s.getValue()) {
} comm = comm.toLowerCase();
if (!found) { if (command.equalsIgnoreCase("/" + comm)) {
event.setCancelled(true); found = true;
player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getCommandDenied())); break;
} else if (command.startsWith("/" + comm + " ")) {
found = true;
break;
} }
} }
} }
if (!found) {
event.setCancelled(true);
player.sendMessage(ChatColor.translateAlternateColorCodes('&', CommandWhitelistBungee.getConfigCache().getPrefix() + CommandWhitelistBungee.getConfigCache().getCommandDenied()));
}
} }
} }
src/main/java/eu/endermite/commandwhitelist/spigot/listeners/LegacyPlayerTabChatCompleteListener.java
+8 -11
View File
@@ -59,7 +59,6 @@ public class LegacyPlayerTabChatCompleteListener {
packet.getSpecificModifier(String[].class).write(0, toWrite); packet.getSpecificModifier(String[].class).write(0, toWrite);
} catch (Exception ignored) {} } catch (Exception ignored) {}
} }
}); });
} }
@@ -78,14 +77,14 @@ public class LegacyPlayerTabChatCompleteListener {
System.out.println(command); System.out.println(command);
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()) { continue;
comm = comm.toLowerCase(); for (String comm : s.getValue()) {
if (command.equalsIgnoreCase("/"+comm)) comm = comm.toLowerCase();
return; if (command.equalsIgnoreCase("/" + comm))
else if (command.startsWith("/" + comm + " ")) { return;
return; else if (command.startsWith("/" + comm + " ")) {
} return;
} }
} }
} }
@@ -93,9 +92,7 @@ public class LegacyPlayerTabChatCompleteListener {
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
}); });
} }
} }
src/main/java/eu/endermite/commandwhitelist/spigot/listeners/PlayerCommandPreProcessListener.java
+11 -10
View File
@@ -6,6 +6,7 @@ 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.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -15,21 +16,21 @@ public class PlayerCommandPreProcessListener implements Listener {
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"))
return; return;
}
String command = event.getMessage().toLowerCase(); 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()) { continue;
comm = comm.toLowerCase();
if (command.equalsIgnoreCase("/"+comm)) for (String comm : s.getValue()) {
return; comm = comm.toLowerCase();
else if (command.startsWith("/" + comm + " ")) { if (command.equalsIgnoreCase("/" + comm))
return; return;
} else if (command.startsWith("/" + comm + " ")) {
return;
} }
} }
} }