Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added kick command functionality

Browse Source
This commit is contained in:
tylerlowrey 2020-07-15 20:48:37 -04:00 committed by Joshua Yanovski
parent 07e33286ad
commit dadb1fbe12
1 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
server/src/cmd.rs
View File

@ -65,6 +65,7 @@ fn get_handler(cmd: &ChatCommand) -> CommandHandler {
match cmd {
ChatCommand::Adminify => handle_adminify,
ChatCommand::Alias => handle_alias,
ChatCommand::Ban => handle_ban,
ChatCommand::Build => handle_build,
ChatCommand::Campfire => handle_spawn_campfire,
ChatCommand::Debug => handle_debug,
@ -80,6 +81,7 @@ fn get_handler(cmd: &ChatCommand) -> CommandHandler {
ChatCommand::Help => handle_help,
ChatCommand::JoinFaction => handle_join_faction,
ChatCommand::Jump => handle_jump,
ChatCommand::Kick => handle_kick,
ChatCommand::Kill => handle_kill,
ChatCommand::KillNpcs => handle_kill_npcs,
ChatCommand::Lantern => handle_lantern,
@ -98,6 +100,7 @@ fn get_handler(cmd: &ChatCommand) -> CommandHandler {
ChatCommand::Tell => handle_tell,
ChatCommand::Time => handle_time,
ChatCommand::Tp => handle_tp,
ChatCommand::Unban => handle_unban,
ChatCommand::Version => handle_version,
ChatCommand::Waypoint => handle_waypoint,
ChatCommand::Whitelist => handle_whitelist,
@ -1810,3 +1813,71 @@ fn handle_whitelist(
);
}
}
fn handle_kick(
server: &mut Server,
client: EcsEntity,
_target: EcsEntity,
args: String,
action: &ChatCommand,
) {
if let (Some(target_alias), reason_opt) = scan_fmt_some!(&args, &action.arg_fmt(), String, String) {
let reason = reason_opt.unwrap_or(String::new());
let ecs = server.state.ecs();
let target_player_opt = (&ecs.entities(), &ecs.read_storage::<comp::Player>())
.join()
.find(|(_, player)| player.alias == target_alias)
.map(|(entity, _)| entity);
if let Some(target_player) = target_player_opt {
server.notify_client(
target_player,
ServerMsg::Disconnect
);
server.notify_client(
client,
ChatType::CommandInfo.server_msg(
format!("Kicked {} from the server with reason: {}",
target_alias,
reason))
);
} else {
server.notify_client(
client,
ChatType::CommandError.server_msg(format!("Player with alias {} not found", target_alias))
)
}
} else {
server.notify_client(
client,
ChatType::CommandError.server_msg(action.help_string())
);
}
}
fn handle_ban(
server: &mut Server,
client: EcsEntity,
_target: EcsEntity,
_args: String,
_action: &ChatCommand,
) {
server.notify_client(
client,
ChatType::CommandInfo.server_msg("This command is not yet implemented")
)
}
fn handle_unban(
server: &mut Server,
client: EcsEntity,
_target: EcsEntity,
_args: String,
_action: &ChatCommand,
) {
server.notify_client(
client,
ChatType::CommandInfo.server_msg("This command is not yet implemented")
)
}