Skip to content

Commit 0b3f925

Browse files
committed
Add assembly DLL blacklist to defer to bundled instead
1 parent 0842968 commit 0b3f925

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

src/CSharpPluginLoader.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ public class CSharpPluginLoader : PluginLoader
1212
public static string[] DefaultReferences = { "mscorlib", "Oxide.Core", "Oxide.CSharp", "System", "System.Core", "System.Data" };
1313
public static HashSet<string> PluginReferences = new HashSet<string>(DefaultReferences);
1414
public static CSharpPluginLoader Instance;
15-
private static Dictionary<string, CompilablePlugin> plugins = new Dictionary<string, CompilablePlugin>();
15+
1616
private static CSharpExtension extension;
17+
private static Dictionary<string, CompilablePlugin> plugins = new Dictionary<string, CompilablePlugin>();
18+
private static readonly string[] AssemblyBlacklist = { "Newtonsoft.Json", "protobuf-net", "websocket-sharp" };
1719

1820
public static CompilablePlugin GetCompilablePlugin(string directory, string name)
1921
{
@@ -48,7 +50,11 @@ public void OnModLoaded()
4850
if (extension == null || !extension.IsCoreExtension && !extension.IsGameExtension) continue;
4951

5052
var assembly = extension.GetType().Assembly;
51-
PluginReferences.Add(assembly.GetName().Name);
53+
var assemblyName = assembly.GetName().Name;
54+
55+
if (AssemblyBlacklist.Contains(assemblyName)) continue;
56+
57+
PluginReferences.Add(assemblyName);
5258
foreach (var reference in assembly.GetReferencedAssemblies())
5359
if (reference != null) PluginReferences.Add(reference.Name);
5460
}

0 commit comments

Comments
 (0)