diff --git a/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt b/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt index 992695e..ed362da 100644 --- a/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt +++ b/src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt @@ -23,11 +23,14 @@ 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] } + val target = VRuom.getServer().allServers.find { it.serverInfo.name.lowercase() == args[0].lowercase() } if (target == null) { sender.sendMessage(Message.KICKALL_NO_SERVER) @@ -35,7 +38,7 @@ class KickAllCommand : SimpleCommand { } 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..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: "[]" @@ -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