diff --git a/Dalamud/Game/Internal/Gui/Structs/PartyFinder.cs b/Dalamud/Game/Internal/Gui/Structs/PartyFinder.cs index 36c33dc2c..3a61caf3e 100755 --- a/Dalamud/Game/Internal/Gui/Structs/PartyFinder.cs +++ b/Dalamud/Game/Internal/Gui/Structs/PartyFinder.cs @@ -35,7 +35,7 @@ namespace Dalamud.Game.Internal.Gui.Structs { [MarshalAs(UnmanagedType.ByValArray, SizeConst = 4)] private readonly byte[] header2; - private readonly uint unknownInt1; + internal readonly uint contentIdLower; private readonly ushort unknownShort1; private readonly ushort unknownShort2; @@ -123,6 +123,10 @@ namespace Dalamud.Game.Internal.Gui.Structs { /// public uint Id { get; } /// + /// The lower bits of the player's content ID. + /// + public uint ContentIdLower { get; } + /// /// The name of the player hosting this listing. /// public SeString Name { get; } @@ -256,6 +260,7 @@ namespace Dalamud.Game.Internal.Gui.Structs { this.jobsPresent = listing.jobsPresent; Id = listing.id; + ContentIdLower = listing.contentIdLower; Name = seStringManager.Parse(listing.name.TakeWhile(b => b != 0).ToArray()); Description = seStringManager.Parse(listing.description.TakeWhile(b => b != 0).ToArray()); World = new Lazy(() => dataManager.GetExcelSheet().GetRow(listing.world)); diff --git a/Dalamud/Localization.cs b/Dalamud/Localization.cs index f1d2c3b0f..4fefa1fe3 100644 --- a/Dalamud/Localization.cs +++ b/Dalamud/Localization.cs @@ -126,9 +126,9 @@ namespace Dalamud /// The string key to be returned. /// The fallback string, usually your source language. /// The localized string, fallback or string key if not found. - public string Localize(string key, string fallBack) + public static string Localize(string key, string fallBack) { - return Loc.Localize(key, fallBack, this.assembly); + return Loc.Localize(key, fallBack, Assembly.GetCallingAssembly()); } private string ReadLocData(string langCode)