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

Fixed requiring a restart in order for banlist to take effect

Browse Source
This commit is contained in:
tylerlowrey
2020-07-16 22:01:11 -04:00
committed by Joshua Yanovski
parent ea4f9b9a36
commit e9348f2fb5
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/cmd.rs
View File

@ -26,6 +26,7 @@ use world::util::Sampler;
use scan_fmt::{scan_fmt, scan_fmt_some}; use scan_fmt::{scan_fmt, scan_fmt_some};
use tracing::error; use tracing::error;
use crate::auth_provider::AuthProvider;
pub trait ChatCommandExt { pub trait ChatCommandExt {
fn execute(&self, server: &mut Server, entity: EcsEntity, args: String); fn execute(&self, server: &mut Server, entity: EcsEntity, args: String);
@ -1877,6 +1878,9 @@ fn handle_ban(
server.settings_mut().edit(|s| { server.settings_mut().edit(|s| {
s.banlist.push((target_alias.clone(), reason.clone())) s.banlist.push((target_alias.clone(), reason.clone()))
}); });
// Override AuthProvider's banlist since it is only a copy
let mut accounts = server.state.ecs().write_resource::<AuthProvider>();
accounts.banlist = server.settings().banlist.clone();
server.notify_client( server.notify_client(
client, client,
ChatType::CommandInfo.server_msg( ChatType::CommandInfo.server_msg(
@ -1905,7 +1909,9 @@ fn handle_unban(
server.settings_mut().edit(|s| { server.settings_mut().edit(|s| {
s.banlist.retain(|x| !(x.0).eq_ignore_ascii_case(&username)) s.banlist.retain(|x| !(x.0).eq_ignore_ascii_case(&username))
}); });
// Override AuthProvider's banlist since it is only a copy
let mut accounts = server.state.ecs().write_resource::<AuthProvider>();
accounts.banlist = server.settings().banlist.clone();
server.notify_client( server.notify_client(
client, client,
ChatType::CommandInfo.server_msg(format!("{} was successfully unbanned", username)), ChatType::CommandInfo.server_msg(format!("{} was successfully unbanned", username)),