Skip to content

Kick all players in the network in /kickall command #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mallusrgreatv2 wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Kick all players in the network in /kickall command #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8f25d7c
Kick all players in the network in /kickall command
mallusrgreatv2 Dec 25, 2023
d810888
change message prefix in config
mallusrgreatv2 Dec 25, 2023
89b1662
put target back up above the null check
mallusrgreatv2 Dec 25, 2023
15c78d3
Merge branch 'Syrent:master' into master
mallusrgreatv2 Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/java/ir/syrent/enhancedvelocity/command/KickAllCommand.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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] }
val target = VRuom.getServer().allServers.find { it.serverInfo.name.lowercase() == args[0].lowercase() }

if (target == null) {
sender.sendMessage(Message.KICKALL_NO_SERVER)
return
}

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
}

Expand Down
3 changes: 2 additions & 1 deletion src/main/java/ir/syrent/enhancedvelocity/storage/Message.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("");
}
10 changes: 5 additions & 5 deletions src/main/resources/languages/en_US.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
general:
raw_prefix: "[VelocityReport]"
prefix: "<gradient:dark_red:red>VelocityReport</gradient> <gold>|</gold>"
console_prefix: "<gray>[<gradient:dark_red:red>VelocityReport</gradient>]</gray>"
raw_prefix: "[EnhancedVelocity]"
prefix: "<gradient:dark_red:red>EnhancedVelocity</gradient> <gold>|</gold>"
console_prefix: "<gray>[<gradient:dark_red:red>EnhancedVelocity</gradient>]</gray>"
successful_prefix: "<dark_gray>[</dark_gray><dark_green><bold>✔</bold><dark_gray>]</dark_gray>"
warn_prefix: "<dark_gray>[</dark_gray><gold><bold>!</bold><dark_gray>]</dark_gray>"
error_prefix: "<dark_gray>[</dark_gray><dark_red><bold>✘</bold><dark_gray>]</dark_gray>"
Expand Down Expand Up @@ -38,6 +38,6 @@ features:
use_target: "$successful_prefix <gradient:dark_green:green><gold>$player</gold> ping is <green>$ping</green>"
kickall:
command:
use: "$successful_prefix <gradient:dark_green:green>Kicked all users from <yellow>$server</yellow>!"
usage: "$warn_prefix <gradient:dark_red:red>Usage: <gold>/kickall <yellow><server>"
use_server: "$successful_prefix <gradient:dark_green:green>Kicked all players from <yellow>$server</yellow>!"
use_global: "$successful_prefix <gradient:dark_green:green>Kicked all players!"
no_server: "$error_prefix <gradient:dark_red:red>Server not found!"