FixConflictServer

ZoFo/GameCore/GameManagers/NetworkManager/ServerNetworkManager.cs

@@ -52,14 +52,8 @@ namespace ZoFo.GameCore.GameManagers.NetworkManager
         {
             updates.Add(data);
         }
-<<<<<<< Updated upstream
+
         public void CloseConnection() //По сути коне игры и отключение игроков
-=======
-        /// <summary>
-        /// 
-        /// </summary>
-        public void CloseConnection()
->>>>>>> Stashed changes
         {
             foreach (var item in clients)
             {

ZoFo/GameCore/Server.cs

@@ -47,15 +47,11 @@ namespace ZoFo.GameCore
         {
             UpdateGameEnded gameEnded = new UpdateGameEnded();
             networkManager.AddData(gameEnded);
-<<<<<<< Updated upstream
             networkManager.CloseConnection();
         } 
-        internal void Update(GameTime gameTime)
+
-=======
-        }
 
         public void Update(GameTime gameTime)
->>>>>>> Stashed changes
         { 
         }