BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2026-04-14 11:46:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix server and client resource behavior, canonicalize paths in mod requests

Browse Source
This commit is contained in:
Lion Kortlepel
2023-11-23 17:42:10 +01:00
parent 72bec02e21
commit 787f59ba46
4 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/server/mod.rs
View File

@@ -27,11 +27,12 @@ pub use plugins::*;
pub use http::*;
pub use crate::config::Config;
use crate::config::GeneralSettings;
fn load_plugins() -> Vec<Plugin> {
fn load_plugins(server_resource_folder: String) -> Vec<Plugin> {
let mut plugins = Vec::new();
for res_entry in std::fs::read_dir("Resources/Server").expect("Failed to read Resources/Server!") {
for res_entry in std::fs::read_dir(server_resource_folder).expect("Failed to read server resource folder!") {
if let Ok(res_entry) = res_entry {
let res_path = res_entry.path();
if res_path.is_dir() {
@@ -158,8 +159,12 @@ impl Server {
Arc::new(UdpSocket::bind(bind_addr).await?)
};
let server_resource_folder = config.general
.get_server_resource_folder()
.expect("Failed to create the client resource folder");
// Load existing plugins
let plugins = load_plugins();
let plugins = load_plugins(server_resource_folder);
// Start client runtime
let (clients_incoming_tx, clients_incoming_rx) = mpsc::channel(100);