ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into api4

Browse source
This commit is contained in:
Ottermandias 2021-08-29 16:19:10 +02:00
commit 33702f9d7a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Penumbra/Mods/ModCollection.cs
View file

@ -74,14 +74,14 @@ namespace Penumbra.Mods
{ {
if( Settings.TryGetValue( mod.BasePath.Name, out var settings ) ) if( Settings.TryGetValue( mod.BasePath.Name, out var settings ) )
{ {
Cache.AddMod( settings, mod ); Cache.AddMod( settings, mod, false );
} }
else else
{ {
changedSettings = true; changedSettings = true;
var newSettings = ModSettings.DefaultSettings( mod.Meta ); var newSettings = ModSettings.DefaultSettings( mod.Meta );
Settings.Add( mod.BasePath.Name, newSettings ); Settings.Add( mod.BasePath.Name, newSettings );
Cache.AddMod( newSettings, mod ); Cache.AddMod( newSettings, mod, false );
} }
} }

4
Penumbra/Mods/ModCollectionCache.cs
View file

@ -126,14 +126,14 @@ namespace Penumbra.Mods
private static readonly PriorityComparer Comparer = new(); private static readonly PriorityComparer Comparer = new();
public void AddMod( ModSettings settings, ModData data ) public void AddMod( ModSettings settings, ModData data, bool updateFileList = true )
{ {
if( !AvailableMods.TryGetValue( data.BasePath.Name, out var existingMod ) ) if( !AvailableMods.TryGetValue( data.BasePath.Name, out var existingMod ) )
{ {
var newMod = new Mod.Mod( settings, data ); var newMod = new Mod.Mod( settings, data );
AvailableMods[ data.BasePath.Name ] = newMod; AvailableMods[ data.BasePath.Name ] = newMod;
if( settings.Enabled ) if( updateFileList && settings.Enabled )
{ {
CalculateEffectiveFileList(); CalculateEffectiveFileList();
if( data.Resources.MetaManipulations.Count > 0 ) if( data.Resources.MetaManipulations.Count > 0 )