From 8f25d7cb7e333f1ecb594a9d27aee3847cad49ea Mon Sep 17 00:00:00 2001 From: mallusrgreatv2 <69511006+mallusrgreatv2@users.noreply.github.com> Date: Mon, 25 Dec 2023 19:18:51 +0530 Subject: [PATCH 1/3] Kick all players in the network in /kickall command --- .../syrent/enhancedvelocity/command/KickAllCommand.kt | 11 +++++++---- .../ir/syrent/enhancedvelocity/storage/Message.kt | 3 ++- src/main/resources/languages/en_US.yml | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt b/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt index ae4ad79..21446cc 100644 --- a/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt +++ b/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt @@ -23,19 +23,22 @@ class KickAllCommand : SimpleCommand { } if (args.isEmpty()) { - sender.sendMessage(Message.KICKALL_USAGE) + for (server in VRuom.getServer().allServers) { + server.playersConnected.filter { !it.hasPermission(Permissions.Actions.KICKALL_BYPASS) }.forEach { it.createConnectionRequest(server).fireAndForget() } + } + sender.sendMessage(Message.KICKALL_USE_GLOBAL) return } - val target = VRuom.getServer().allServers.find { it.serverInfo.name.lowercase() == args[0] } - if (target == null) { sender.sendMessage(Message.KICKALL_NO_SERVER) return } + val target = VRuom.getServer().allServers.find { it.serverInfo.name.lowercase() == args[0].lowercase() } + target.playersConnected.filter { !it.hasPermission(Permissions.Actions.KICKALL_BYPASS) }.forEach { it.createConnectionRequest(VRuom.getServer().allServers.first()).fireAndForget() } - sender.sendMessage(Message.KICKALL_USE, TextReplacement("server", target.serverInfo.name)) + sender.sendMessage(Message.KICKALL_USE_SERVER, TextReplacement("server", target.serverInfo.name)) return } diff --git a/src/main/java/ir/syrent/enhancedvelocity/storage/Message.kt b/src/main/java/ir/syrent/enhancedvelocity/storage/Message.kt index 4c8b6c7..0c664a7 100644 --- a/src/main/java/ir/syrent/enhancedvelocity/storage/Message.kt +++ b/src/main/java/ir/syrent/enhancedvelocity/storage/Message.kt @@ -28,7 +28,8 @@ enum class Message(val path: String) { PING_NO_TARGET("features.ping.command.no_target"), PING_USE_TARGET("features.ping.command.use_target"), KICKALL_USAGE("features.kickall.command.usage"), - KICKALL_USE("features.kickall.command.use"), + KICKALL_USE_SERVER("features.kickall.command.use_server"), + KICKALL_USE_GLOBAL("features.kickall.command.use_global"), KICKALL_NO_SERVER("features.kickall.command.no_server"), EMPTY(""); } \ No newline at end of file diff --git a/src/main/resources/languages/en_US.yml b/src/main/resources/languages/en_US.yml index d77ca3e..6c6a486 100644 --- a/src/main/resources/languages/en_US.yml +++ b/src/main/resources/languages/en_US.yml @@ -38,6 +38,6 @@ features: use_target: "$successful_prefix $player ping is $ping" kickall: command: - use: "$successful_prefix Kicked all users from $server!" - usage: "$warn_prefix Usage: /kickall " + use_server: "$successful_prefix Kicked all players from $server!" + use_global: "$successful_prefix Kicked all players!" no_server: "$error_prefix Server not found!" \ No newline at end of file From d810888bb458b0f9c0516c8662f80ec66da2b290 Mon Sep 17 00:00:00 2001 From: mallusrgreatv2 <69511006+mallusrgreatv2@users.noreply.github.com> Date: Mon, 25 Dec 2023 19:35:25 +0530 Subject: [PATCH 2/3] change message prefix in config --- src/main/resources/languages/en_US.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/languages/en_US.yml b/src/main/resources/languages/en_US.yml index 6c6a486..627d80f 100644 --- a/src/main/resources/languages/en_US.yml +++ b/src/main/resources/languages/en_US.yml @@ -1,7 +1,7 @@ general: - raw_prefix: "[VelocityReport]" - prefix: "VelocityReport |" - console_prefix: "[VelocityReport]" + raw_prefix: "[EnhancedVelocity]" + prefix: "EnhancedVelocity |" + console_prefix: "[EnhancedVelocity]" successful_prefix: "[✔]" warn_prefix: "[!]" error_prefix: "[✘]" From 89b1662fac17a185e2fe6eeaf76b67c73d996d42 Mon Sep 17 00:00:00 2001 From: mallusrgreatv2 <69511006+mallusrgreatv2@users.noreply.github.com> Date: Mon, 25 Dec 2023 19:42:29 +0530 Subject: [PATCH 3/3] put target back up above the null check --- .../java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt b/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt index 21446cc..6cd22c6 100644 --- a/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt +++ b/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt @@ -30,13 +30,13 @@ class KickAllCommand : SimpleCommand { return } + val target = VRuom.getServer().allServers.find { it.serverInfo.name.lowercase() == args[0].lowercase() } + if (target == null) { sender.sendMessage(Message.KICKALL_NO_SERVER) return } - val target = VRuom.getServer().allServers.find { it.serverInfo.name.lowercase() == args[0].lowercase() } - target.playersConnected.filter { !it.hasPermission(Permissions.Actions.KICKALL_BYPASS) }.forEach { it.createConnectionRequest(VRuom.getServer().allServers.first()).fireAndForget() } sender.sendMessage(Message.KICKALL_USE_SERVER, TextReplacement("server", target.serverInfo.name)) return