From 99bbe58255d41d52fca746153310e5e372c6c3f3 Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Tue, 15 Jan 2019 23:58:25 -0800 Subject: [PATCH] Fix server to correctly resolve module script names --- server/src/rbx_snapshot.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/rbx_snapshot.rs b/server/src/rbx_snapshot.rs index 35446f14..73ee3ea5 100644 --- a/server/src/rbx_snapshot.rs +++ b/server/src/rbx_snapshot.rs @@ -255,16 +255,16 @@ fn snapshot_imfs_file<'source>( fn snapshot_lua_file<'source>( file: &'source ImfsFile, ) -> SnapshotResult<'source> { - let file_name = file.path - .file_name().expect("Could not extract file stem") + let file_stem = file.path + .file_stem().expect("Could not extract file stem") .to_str().expect("Could not convert path to UTF-8"); - let (instance_name, class_name) = if let Some(name) = match_trailing(file_name, ".server.lua") { + let (instance_name, class_name) = if let Some(name) = match_trailing(file_stem, ".server") { (name, "Script") - } else if let Some(name) = match_trailing(file_name, ".client.lua") { + } else if let Some(name) = match_trailing(file_stem, ".client") { (name, "LocalScript") } else { - (file_name, "ModuleScript") + (file_stem, "ModuleScript") }; let contents = str::from_utf8(&file.contents)