Browse Source

Fix conflict checking to only ignore if version matches

pull/72/head
Anairkoen Schno 3 years ago
parent
commit
49a84c16c5
Signed by: DaNike GPG Key ID: BEFB74D5F3FC4387
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      IPA.Loader/Loader/PluginLoader.cs

+ 4
- 2
IPA.Loader/Loader/PluginLoader.cs View File

@ -978,9 +978,11 @@ namespace IPA.Loader
foreach (var conflict in plugin.Manifest.Conflicts) foreach (var conflict in plugin.Manifest.Conflicts)
{ {
Logger.loader.Trace($">- Checking conflict '{conflict.Key}' {conflict.Value}"); Logger.loader.Trace($">- Checking conflict '{conflict.Key}' {conflict.Value}");
if (TryResolveId(conflict.Key, out var meta, out var conflDisabled, out var conflIgnored) && !conflIgnored && !conflDisabled)
if (TryResolveId(conflict.Key, out var meta, out var conflDisabled, out var conflIgnored)
&& conflict.Value.IsSatisfied(meta.Version)
&& !conflIgnored && !conflDisabled) // the conflict is only *actually* a problem if it is both not ignored and not disabled
{ {
// the conflict is only *actually* a problem if it is both not ignored and not disabled
Logger.loader.Warn($"Plugin '{plugin.Id}' conflicts with {meta.Id}@{meta.Version}; ignoring '{plugin.Id}'"); Logger.loader.Warn($"Plugin '{plugin.Id}' conflicts with {meta.Id}@{meta.Version}; ignoring '{plugin.Id}'");
ignoredPlugins.Add(plugin, new(Reason.Conflict) ignoredPlugins.Add(plugin, new(Reason.Conflict)
{ {


Loading…
Cancel
Save