From ccbc680c0e43ada10f560a5def3bd9a2a4913c0e Mon Sep 17 00:00:00 2001
From: michael-bailey <mickyb18a@gmail.com>
Date: Wed, 14 Sep 2022 08:27:29 +0100
Subject: [PATCH] performed cleanup of server

---
 server/src/main.rs           | 4 +---
 server/src/server/builder.rs | 9 +++------
 server/src/server/server.rs  | 8 +++-----
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/server/src/main.rs b/server/src/main.rs
index 935e1bd..da6d645 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -14,12 +14,10 @@ use server::Server;
 
 use tokio::time::{sleep, Duration};
 
-use crate::config_manager::ConfigManager;
-
 /// The main function
 #[actix::main()]
 async fn main() {
-	let init = Server::create(ConfigManager::shared()).build();
+	let _init = Server::create().build();
 	loop {
 		sleep(Duration::from_millis(1000)).await;
 	}
diff --git a/server/src/server/builder.rs b/server/src/server/builder.rs
index a25f5f2..15ccbfb 100644
--- a/server/src/server/builder.rs
+++ b/server/src/server/builder.rs
@@ -1,18 +1,15 @@
-use actix::{Actor, Addr};
-use crate::config_manager::ConfigManager;
 use super::*;
+use actix::{Actor, Addr};
 
 pub struct ServerBuilder {
-	pub(super) config: Addr<ConfigManager>,
 	pub(super) name: Option<String>,
 	pub(super) port: Option<u16>,
 	pub(super) owner: Option<String>,
 }
 
 impl<'rhai> ServerBuilder {
-	pub(super) fn new(config_manager: Addr<ConfigManager>) -> Self {
+	pub(super) fn new() -> Self {
 		Self {
-			config: config_manager,
 			name: None,
 			port: None,
 			owner: None,
@@ -37,4 +34,4 @@ impl<'rhai> ServerBuilder {
 	pub fn build(self) -> Addr<Server> {
 		Server::from(self).start()
 	}
-}
\ No newline at end of file
+}
diff --git a/server/src/server/server.rs b/server/src/server/server.rs
index 9729fdd..09f9b8e 100644
--- a/server/src/server/server.rs
+++ b/server/src/server/server.rs
@@ -36,10 +36,8 @@ pub struct Server {
 }
 
 impl Server {
-	pub(crate) fn create(
-		config_manager: Addr<ConfigManager>,
-	) -> builder::ServerBuilder {
-		ServerBuilder::new(config_manager)
+	pub(crate) fn create() -> builder::ServerBuilder {
+		ServerBuilder::new()
 	}
 
 	pub(crate) fn client_request(
@@ -189,7 +187,7 @@ impl Handler<ClientManagerOutput> for Server {
 }
 
 impl From<ServerBuilder> for Server {
-	fn from(builder: ServerBuilder) -> Self {
+	fn from(_builder: ServerBuilder) -> Self {
 		Server {
 			name: None,
 			owner: None,