From 7cc71b2a3d382443bf730fc10ed44fe7e6e7a899 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 19 Mar 2022 23:39:24 +0100 Subject: [PATCH] added permission check to SendTestMessageCommand --- .../proxy/command/SendTestMessageCommand.java | 83 ++++++++++--------- 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java b/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java index 4548ede..2bc63e3 100644 --- a/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java +++ b/src/main/java/net/krakatoa/proxy/command/SendTestMessageCommand.java @@ -1,5 +1,7 @@ package net.krakatoa.proxy.command; +import de.dytanic.cloudnet.driver.CloudNetDriver; +import de.dytanic.cloudnet.driver.permission.IPermissionUser; import earth.krakatao.protocol.KraSocketClientProtocolMessage; import earth.krakatao.protocol.KraSocketClientProtocolStatus; import java.util.function.Consumer; @@ -11,6 +13,8 @@ import net.md_5.bungee.api.plugin.Command; public class SendTestMessageCommand extends Command { + // /sendTestMessage + public SendTestMessageCommand(String name) { super(name); } @@ -20,49 +24,52 @@ public class SendTestMessageCommand extends Command { if (commandSender instanceof ProxiedPlayer) { ProxiedPlayer proxiedPlayer = (ProxiedPlayer) commandSender; - // /sendTestMessage + IPermissionUser permissionUser = CloudNetDriver.getInstance().getPermissionManagement() + .getUser(proxiedPlayer.getUniqueId()); - if (args.length == 5) { - try { - int cmdID; + if (permissionUser != null && permissionUser.hasPermission("*").asBoolean()) { + if (args.length == 5) { + try { + int cmdID; - byte status = Byte.parseByte(args[0]); + byte status = Byte.parseByte(args[0]); - if (status == KraSocketClientProtocolStatus.GET.getStatus()) { - cmdID = ProxySystem.getInstance().getKraSocketClientProtocol().generateCmdID(); - } else { - cmdID = Byte.parseByte(args[1]); + if (status == KraSocketClientProtocolStatus.GET.getStatus()) { + cmdID = ProxySystem.getInstance().getKraSocketClientProtocol().generateCmdID(); + } else { + cmdID = Byte.parseByte(args[1]); + } + + Consumer consumer = null; + if (status == KraSocketClientProtocolStatus.GET.getStatus()) { + consumer = kraSocketClientProtocolMessage -> { + proxiedPlayer.sendMessage(new TextComponent( + "Received msg -> status:" + kraSocketClientProtocolMessage.getStatus() + + " cmdID: " + + kraSocketClientProtocolMessage.getCmdID() + " dest: " + + kraSocketClientProtocolMessage.getDest() + " uuid: " + + kraSocketClientProtocolMessage.getUuid() + " cmdNumber: " + + kraSocketClientProtocolMessage.getCmdNumber() + " args: " + + kraSocketClientProtocolMessage.getArgs())); + }; + } + + KraSocketClientProtocolMessage kraSocketClientProtocolMessage = null; + + kraSocketClientProtocolMessage = new KraSocketClientProtocolMessage( + status, (byte) cmdID, Integer.parseInt(args[2]), + proxiedPlayer.getUniqueId(), Integer.parseInt(args[3]), args[4], + consumer); + + ProxySystem.getInstance().getKraSocketClient().getSocketClient() + .SendMessage(kraSocketClientProtocolMessage); + } catch (NumberFormatException exception) { + proxiedPlayer.sendMessage(new TextComponent("§7Error: §cNumberFormatException")); } - - Consumer consumer = null; - if (status == KraSocketClientProtocolStatus.GET.getStatus()) { - consumer = kraSocketClientProtocolMessage -> { - proxiedPlayer.sendMessage(new TextComponent( - "Received msg -> status:" + kraSocketClientProtocolMessage.getStatus() - + " cmdID: " - + kraSocketClientProtocolMessage.getCmdID() + " dest: " - + kraSocketClientProtocolMessage.getDest() + " uuid: " - + kraSocketClientProtocolMessage.getUuid() + " cmdNumber: " - + kraSocketClientProtocolMessage.getCmdNumber() + " args: " - + kraSocketClientProtocolMessage.getArgs())); - }; - } - - KraSocketClientProtocolMessage kraSocketClientProtocolMessage = null; - - kraSocketClientProtocolMessage = new KraSocketClientProtocolMessage( - status, (byte) cmdID, Integer.parseInt(args[2]), - proxiedPlayer.getUniqueId(), Integer.parseInt(args[3]), args[4], - consumer); - - ProxySystem.getInstance().getKraSocketClient().getSocketClient() - .SendMessage(kraSocketClientProtocolMessage); - } catch (NumberFormatException exception) { - proxiedPlayer.sendMessage(new TextComponent("§7Error: §cNumberFormatException")); + } else { + proxiedPlayer.sendMessage(new TextComponent( + "§cVerwendung: §7/sendTestMessage ")); } - } else { - proxiedPlayer.sendMessage(new TextComponent( - "§cVerwendung: §7/sendTestMessage ")); } } }