From e9348f2fb5c6abf9cd86cc4d7ab3f1bdb6da0623 Mon Sep 17 00:00:00 2001 From: tylerlowrey Date: Thu, 16 Jul 2020 22:01:11 -0400 Subject: [PATCH] Fixed requiring a restart in order for banlist to take effect --- server/src/cmd.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/src/cmd.rs b/server/src/cmd.rs index 3b9206b9ec..5eb5212ec3 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -26,6 +26,7 @@ use world::util::Sampler; use scan_fmt::{scan_fmt, scan_fmt_some}; use tracing::error; +use crate::auth_provider::AuthProvider; pub trait ChatCommandExt { fn execute(&self, server: &mut Server, entity: EcsEntity, args: String); @@ -1877,6 +1878,9 @@ fn handle_ban( server.settings_mut().edit(|s| { 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::(); + accounts.banlist = server.settings().banlist.clone(); server.notify_client( client, ChatType::CommandInfo.server_msg( @@ -1905,7 +1909,9 @@ fn handle_unban( server.settings_mut().edit(|s| { 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::(); + accounts.banlist = server.settings().banlist.clone(); server.notify_client( client, ChatType::CommandInfo.server_msg(format!("{} was successfully unbanned", username)),