# HG changeset patch
# User alfadur
# Date 1544196066 -10800
# Node ID e5db279308d79887344a1f156e94b68599d17e96
# Parent  4409344db447aa8d74a12c77b5875f16291a72f3
dispose of server mods

diff -r 4409344db447 -r e5db279308d7 gameServer2/src/server/actions.rs
--- a/gameServer2/src/server/actions.rs	Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/actions.rs	Fri Dec 07 18:21:06 2018 +0300
@@ -4,7 +4,7 @@
     mem::replace
 };
 use super::{
-    server::HWServer,
+    core::HWServer,
     room::{GameInfo, RoomFlags},
     client::HWClient,
     coretypes::{ClientId, RoomId, GameCfg, VoteType},
diff -r 4409344db447 -r e5db279308d7 gameServer2/src/server/handlers/checker.rs
--- a/gameServer2/src/server/handlers/checker.rs	Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/handlers/checker.rs	Fri Dec 07 18:21:06 2018 +0300
@@ -3,7 +3,7 @@
 
 use crate::{
     server::{
-        server::HWServer,
+        core::HWServer,
         coretypes::ClientId,
     },
     protocol::messages::{
diff -r 4409344db447 -r e5db279308d7 gameServer2/src/server/handlers/common.rs
--- a/gameServer2/src/server/handlers/common.rs	Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/handlers/common.rs	Fri Dec 07 18:21:06 2018 +0300
@@ -1,5 +1,5 @@
 use crate::{
-    server::{actions::Action, server::HWServer},
+    server::{actions::Action, core::HWServer},
     protocol::messages::{
         HWProtocolMessage::{self, Rnd}, HWServerMessage::{self, ChatMsg},
     }
diff -r 4409344db447 -r e5db279308d7 gameServer2/src/server/handlers/inroom.rs
--- a/gameServer2/src/server/handlers/inroom.rs	Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/handlers/inroom.rs	Fri Dec 07 18:21:06 2018 +0300
@@ -6,7 +6,7 @@
             ClientId, RoomId, Voting, VoteType, GameCfg,
             MAX_HEDGEHOGS_PER_TEAM
         },
-        server::HWServer,
+        core::HWServer,
         room::{HWRoom, RoomFlags},
         actions::{Action, Action::*}
     },
diff -r 4409344db447 -r e5db279308d7 gameServer2/src/server/handlers/lobby.rs
--- a/gameServer2/src/server/handlers/lobby.rs	Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/handlers/lobby.rs	Fri Dec 07 18:21:06 2018 +0300
@@ -2,7 +2,7 @@
 
 use crate::{
     server::{
-        server::HWServer,
+        core::HWServer,
         coretypes::ClientId,
         actions::{Action, Action::*}
     },
diff -r 4409344db447 -r e5db279308d7 gameServer2/src/server/handlers/loggingin.rs
--- a/gameServer2/src/server/handlers/loggingin.rs	Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/handlers/loggingin.rs	Fri Dec 07 18:21:06 2018 +0300
@@ -3,7 +3,7 @@
 use crate::{
     server::{
         client::HWClient,
-        server::HWServer,
+        core::HWServer,
         coretypes::ClientId,
         actions::{Action, Action::*}
     },
diff -r 4409344db447 -r e5db279308d7 gameServer2/src/server/network.rs
--- a/gameServer2/src/server/network.rs	Fri Dec 07 14:30:35 2018 +0100
+++ b/gameServer2/src/server/network.rs	Fri Dec 07 18:21:06 2018 +0300
@@ -20,7 +20,7 @@
     protocol::{ProtocolDecoder, messages::*}
 };
 use super::{
-    server::{HWServer},
+    core::{HWServer},
     coretypes::ClientId
 };
 #[cfg(feature = "tls-connections")]