warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes bug with configurations (#236)

Browse source 
- [X] Changes brace style to enforced
- [X] Fixes null source with assemblies.json
- [X] Fixes bad path for missing json files

Bumps release version
This commit is contained in:
Kamron Batman 2020-09-10 23:38:06 -07:00 • committed by GitHub
parent 96465c8530
commit c3d2740983
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 88 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Projects/Server/Main.cs
View file

@ -80,7 +80,7 @@ namespace Server
public static readonly bool IsLinux = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) || IsFreeBSD;
public static readonly bool Unix = IsDarwin || IsFreeBSD || IsLinux;
private static readonly string assembliesConfiguration = "Configuration/assemblies.json";
private const string assembliesConfiguration = "Data/assemblies.json";
public static bool IsRunningFromXUnit =>
m_IsRunningFromXUnit ??= AppDomain.CurrentDomain.GetAssemblies()
@ -444,12 +444,13 @@ namespace Server
ServerConfiguration.Load();
var assemblyPath = Path.Join(BaseDirectory, assembliesConfiguration);
// Load UOContent.dll
var assemblyFiles = JsonConfig.Deserialize<List<string>>(
Path.Join(BaseDirectory, assembliesConfiguration)
)
var assemblyFiles = JsonConfig.Deserialize<List<string>>(assemblyPath)
.Select(t => Path.Join(BaseDirectory, "Assemblies", t))
.ToArray();
AssemblyHandler.LoadScripts(assemblyFiles);
VerifySerialization();