ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-23 00:07:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/goatcorp/Dalamud

Browse source
This commit is contained in:
goaaats 2021-10-07 19:08:38 +02:00
commit bc558fb425
No known key found for this signature in database
GPG key ID: F18F057873895461
9 changed files with 130 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dalamud/Game/Gui/FlyText/FlyTextGui.cs
View file

@ -213,8 +213,8 @@ namespace Dalamud.Game.Gui.FlyText
var tmpKind = kind;
var tmpVal1 = val1;
var tmpVal2 = val2;
var tmpText1 = MemoryHelper.ReadSeStringNullTerminated(text1);
var tmpText2 = MemoryHelper.ReadSeStringNullTerminated(text2);
var tmpText1 = text1 == IntPtr.Zero ? string.Empty : MemoryHelper.ReadSeStringNullTerminated(text1);
var tmpText2 = text2 == IntPtr.Zero ? string.Empty : MemoryHelper.ReadSeStringNullTerminated(text2);
var tmpColor = color;
var tmpIcon = icon;
var tmpYOffset = yOffset;

2
Dalamud/Game/Gui/PartyFinder/Internal/PartyFinderPacketListing.cs
View file

@ -51,7 +51,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Internal
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 3)]
private readonly byte[] header7; // all zero in every pf I've examined
private readonly uint lastPatchHotfixTimestamp; // last time the servers were restarted?
internal readonly uint LastPatchHotfixTimestamp; // last time the servers were restarted?
internal readonly ushort SecondsRemaining;
[MarshalAs(UnmanagedType.ByValArray, SizeConst = 6)]

7
Dalamud/Game/Gui/PartyFinder/Types/PartyFinderListing.cs
View file

@ -54,6 +54,7 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
this.MinimumItemLevel = listing.MinimumItemLevel;
this.Parties = listing.NumParties;
this.SlotsAvailable = listing.NumSlots;
this.LastPatchHotfixTimestamp = listing.LastPatchHotfixTimestamp;
this.JobsPresent = listing.JobsPresent
.Select(id => new Lazy<ClassJob>(
() => id == 0
@ -143,6 +144,12 @@ namespace Dalamud.Game.Gui.PartyFinder.Types
/// </summary>
public byte SlotsAvailable { get; }
/// <summary>
/// Gets the time at which the server this listings is on last restarted for a patch/hotfix.
/// Probably.
/// </summary>
public uint LastPatchHotfixTimestamp { get; }
/// <summary>
/// Gets a list of player slots that the Party Finder is accepting.
/// </summary>