From 49b53b7a6a04f97b8a302bea2fa8d38efeed6dfe Mon Sep 17 00:00:00 2001 From: Ottermandias Date: Mon, 26 Sep 2022 20:13:02 +0200 Subject: [PATCH] Maybe final meta fixes? --- Penumbra/Interop/CharacterUtility.List.cs | 2 +- Penumbra/Interop/Resolver/PathResolver.ResolverHooks.cs | 9 ++------- Penumbra/UI/ConfigWindow.Changelog.cs | 8 ++++---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Penumbra/Interop/CharacterUtility.List.cs b/Penumbra/Interop/CharacterUtility.List.cs index a73d87aa..3cf137e8 100644 --- a/Penumbra/Interop/CharacterUtility.List.cs +++ b/Penumbra/Interop/CharacterUtility.List.cs @@ -150,7 +150,7 @@ public unsafe partial class CharacterUtility var next = list.First!.Value; if( next.Resetter ) { - List.SetResourceToDefaultCollection(); + List.ResetResourceInternal(); } else { diff --git a/Penumbra/Interop/Resolver/PathResolver.ResolverHooks.cs b/Penumbra/Interop/Resolver/PathResolver.ResolverHooks.cs index 7841027a..0e0716ea 100644 --- a/Penumbra/Interop/Resolver/PathResolver.ResolverHooks.cs +++ b/Penumbra/Interop/Resolver/PathResolver.ResolverHooks.cs @@ -151,7 +151,7 @@ public partial class PathResolver } var data = GetResolveData( drawObject ); - return !data.Valid ? DisposableContainer.Empty : MetaState.ResolveEqdpData(data.ModCollection, MetaState.GetHumanGenderRace( drawObject ), modelType < 5, modelType > 4); + return MetaState.ResolveEqdpData(data.ModCollection, MetaState.GetHumanGenderRace( drawObject ), modelType < 5, modelType > 4); } using var eqdp = Get(); @@ -182,14 +182,9 @@ public partial class PathResolver return ResolvePath( drawObject, _resolveSkpPathHook.Original( drawObject, path, unk3, unk4 ) ); } - private DisposableContainer GetEstChanges( IntPtr drawObject ) + private static DisposableContainer GetEstChanges( IntPtr drawObject ) { var data = GetResolveData( drawObject ); - if( !data.Valid ) - { - return DisposableContainer.Empty; - } - return new DisposableContainer( data.ModCollection.TemporarilySetEstFile( EstManipulation.EstType.Face ), data.ModCollection.TemporarilySetEstFile( EstManipulation.EstType.Body ), data.ModCollection.TemporarilySetEstFile( EstManipulation.EstType.Hair ), diff --git a/Penumbra/UI/ConfigWindow.Changelog.cs b/Penumbra/UI/ConfigWindow.Changelog.cs index cf158935..134cad79 100644 --- a/Penumbra/UI/ConfigWindow.Changelog.cs +++ b/Penumbra/UI/ConfigWindow.Changelog.cs @@ -19,14 +19,14 @@ public partial class ConfigWindow Add5_7_0( ret ); Add5_7_1( ret ); Add5_8_0( ret ); - Add5_8_6( ret ); + Add5_8_7( ret ); return ret; } - private static void Add5_8_6( Changelog log ) - => log.NextVersion( "Version 0.5.8.6" ) - .RegisterEntry( "Fixed some problems with metadata reloading and reverting and IMC files. (5.8.1 to 5.8.6)." ) + private static void Add5_8_7( Changelog log ) + => log.NextVersion( "Version 0.5.8.7" ) + .RegisterEntry( "Fixed some problems with metadata reloading and reverting and IMC files. (5.8.1 to 5.8.7)." ) .RegisterHighlight( "If you encounter any issues, please try completely restarting your game after updating (not just relogging), before reporting them.", 1 );