ToxicMushroom/Penumbra
1
0
Fork 0
mirror of https://github.com/xivdev/Penumbra.git synced 2026-01-03 06:13:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix an issue with retainer assignments using ownership wrongly for mannequins.

Browse source
This commit is contained in:
Ottermandias 2023-03-01 23:11:05 +01:00
parent e62b0155d4
commit c2ac745d72
7 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Penumbra/Collections/IndividualCollections.Access.cs
View file

@ -41,7 +41,7 @@ public sealed partial class IndividualCollections : IReadOnlyList< (string Displ
return true;
}
if( Penumbra.Config.UseOwnerNameForCharacterCollection )
if( identifier.Retainer is not ActorIdentifier.RetainerType.Mannequin && Penumbra.Config.UseOwnerNameForCharacterCollection )
{
return CheckWorlds( _actorManager.GetCurrentPlayer(), out collection );
}

2
Penumbra/Collections/IndividualCollections.cs
View file

@ -70,7 +70,7 @@ public sealed partial class IndividualCollections
return AddResult.Invalid;
}
identifiers = new[] { _actorManager.CreateRetainer( retainerName ) };
identifiers = new[] { _actorManager.CreateRetainer( retainerName, 0 ) };
break;
case IdentifierType.Owned:
if( !ByteString.FromString( name, out var ownerName ) )

2
Penumbra/UI/Classes/ModEditWindow.FileEditor.cs
View file

@ -175,7 +175,7 @@ public partial class ModEditWindow
}
private static T? DefaultParseFile( byte[] bytes )
=> Activator.CreateInstance( typeof( T ), BindingFlags.CreateInstance | BindingFlags.OptionalParamBinding, bytes ) as T;
=> Activator.CreateInstance( typeof( T ), bytes ) as T;
private void UpdateCurrentFile( Mod.Editor.FileRegistry path )
{

2
Penumbra/UI/Classes/ModEditWindow.cs
View file

@ -584,7 +584,7 @@ public partial class ModEditWindow : Window, IDisposable
() => _editor?.ShpkFiles ?? Array.Empty< Editor.FileRegistry >(),
DrawShaderPackagePanel,
() => _mod?.ModPath.FullName ?? string.Empty,
bytes => new ShpkTab( bytes ) );
null );
_center = new CombinedTexture( _left, _right );
}

2
Penumbra/UI/ConfigWindow.CollectionsTab.Individual.cs
View file

@ -322,7 +322,7 @@ public partial class ConfigWindow
IndividualCollections.AddResult.AlreadySet => AlreadyAssigned,
_ => string.Empty,
};
_newRetainerTooltip = Penumbra.CollectionManager.Individuals.CanAdd( IdentifierType.Retainer, _newCharacterName, _worldCombo.CurrentSelection.Key, ObjectKind.None,
_newRetainerTooltip = Penumbra.CollectionManager.Individuals.CanAdd( IdentifierType.Retainer, _newCharacterName, 0, ObjectKind.None,
Array.Empty< uint >(), out _newRetainerIdentifiers ) switch
{
_ when _newCharacterName.Length == 0 => NewRetainerTooltipEmpty,