From 5fe25fb781e539bcce4bbe6b69b2791c34967963 Mon Sep 17 00:00:00 2001 From: zznty <94796179+zznty@users.noreply.github.com> Date: Sun, 8 May 2022 12:26:31 +0700 Subject: [PATCH] ship harmony with torch to prevent crashes due to runtime version mismatch add warning if plugin is using harmony update monomod package --- Torch/Plugins/PluginManager.cs | 7 +++++++ Torch/Torch.csproj | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Torch/Plugins/PluginManager.cs b/Torch/Plugins/PluginManager.cs index cbb45a3..f0d637b 100644 --- a/Torch/Plugins/PluginManager.cs +++ b/Torch/Plugins/PluginManager.cs @@ -383,6 +383,13 @@ namespace Torch.Managers } + + var harmonyAssembly = assemblies.FirstOrDefault(b => b.FullName?.StartsWith("0Harmony") == true); + if (harmonyAssembly is { }) + { + _log.Warn($"Plugin {item.Manifest.Name} is using harmony library, logic collision between plugins could be encountered!"); + assemblies.Remove(harmonyAssembly); + } RegisterAllAssemblies(assemblies); InstantiatePlugin(item.Manifest, assemblies); diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj index 0d4e0cb..0c2d3c1 100644 --- a/Torch/Torch.csproj +++ b/Torch/Torch.csproj @@ -20,9 +20,10 @@ + - +