Minecraft
/
QoL
6
0
Fork 2
Code Issues 3 Pull Requests 2 Projects Releases Wiki Activity

Added tpconfirm permission node to split out tp confirm from the rest of the audit checking

master
Joey Hines 2018-09-23 07:34:25 -05:00
parent b796e3d667
commit fef5ab6b5f
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/xyz/etztech/qol/QoL.java
View File

@ -43,8 +43,6 @@ public class QoL extends JavaPlugin {
essentials = (Essentials) Bukkit.getPluginManager().getPlugin("Essentials"); essentials = (Essentials) Bukkit.getPluginManager().getPlugin("Essentials");
} }
if( isEnabled() ) { if( isEnabled() ) {
// Add listeners // Add listeners

12
src/main/java/xyz/etztech/qol/listeners/CommandPreprocessListener.java
View File

@ -36,11 +36,7 @@ public class CommandPreprocessListener implements Listener {
String base = command.split(" ")[0].substring(1).toLowerCase(); // Strip the slash String base = command.split(" ")[0].substring(1).toLowerCase(); // Strip the slash
Player sender = event.getPlayer(); Player sender = event.getPlayer();
// Command Auditing if (sender.hasPermission("qol.tpconfirm")) {
if (sender.hasPermission("qol.audit") && plugin.getConfig().getBoolean("audit.enabled")) {
boolean auditable = false;
boolean isTpCommand = false;
//check if the command is a tp command //check if the command is a tp command
if (noSlash(base).equals("tp") || noSlash(base).startsWith("tele") || noSlash(command).startsWith("lagg tpchunk")) { if (noSlash(base).equals("tp") || noSlash(base).startsWith("tele") || noSlash(command).startsWith("lagg tpchunk")) {
//If the user is in the confirm tp map, remove them and let the command run //If the user is in the confirm tp map, remove them and let the command run
@ -59,6 +55,11 @@ public class CommandPreprocessListener implements Listener {
sender.spigot().sendMessage(message); sender.spigot().sendMessage(message);
} }
} }
}
// Command Auditing
if (sender.hasPermission("qol.audit") && plugin.getConfig().getBoolean("audit.enabled")) {
boolean auditable = false;
for (String audit : QoL.getAudits()) { for (String audit : QoL.getAudits()) {
if (noSlash(command).startsWith(noSlash(audit))) { if (noSlash(command).startsWith(noSlash(audit))) {
@ -70,7 +71,6 @@ public class CommandPreprocessListener implements Listener {
if (auditable) { if (auditable) {
Map<String, String> post = new HashMap<>(); Map<String, String> post = new HashMap<>();
post.put("username", "QoL Auditor"); post.put("username", "QoL Auditor");
post.put("content", "[" + StringUtils.capitalize(sender.getGameMode().name().toLowerCase()) + "] " + sender.getName() + " executed command: " + command); post.put("content", "[" + StringUtils.capitalize(sender.getGameMode().name().toLowerCase()) + "] " + sender.getName() + " executed command: " + command);
String webhook = plugin.getConfig().getString("audit.webhook"); String webhook = plugin.getConfig().getString("audit.webhook");

3
src/main/resources/plugin.yml
View File

@ -68,6 +68,9 @@ permissions:
qol.audit: qol.audit:
description: Audits command usage description: Audits command usage
default: op default: op
qol.tpconfirm:
description: Makes the user confirm they want to TP out of spec
default: op
qol.whitelist.bypass: qol.whitelist.bypass:
description: Allows someone into the server when Whitelist is enabled description: Allows someone into the server when Whitelist is enabled
default: op default: op