mirror of
https://github.com/goatcorp/Dalamud.git
synced 2026-02-23 00:07:49 +01:00
Merge remote-tracking branch 'origin/master' into api14-rollup
This commit is contained in:
commit
63b7ecf0d7
71 changed files with 1283 additions and 312 deletions
|
|
@ -68,6 +68,9 @@ public sealed unsafe partial class StatusList
|
|||
/// <returns>The status object containing the requested data.</returns>
|
||||
public static StatusList? CreateStatusListReference(nint address)
|
||||
{
|
||||
if (address == IntPtr.Zero)
|
||||
return null;
|
||||
|
||||
// The use case for CreateStatusListReference and CreateStatusReference to be static is so
|
||||
// fake status lists can be generated. Since they aren't exposed as services, it's either
|
||||
// here or somewhere else.
|
||||
|
|
@ -89,9 +92,7 @@ public sealed unsafe partial class StatusList
|
|||
/// <returns>The status object containing the requested data.</returns>
|
||||
public static IStatus? CreateStatusReference(nint address)
|
||||
{
|
||||
var clientState = Service<ClientState>.Get();
|
||||
|
||||
if (clientState.LocalContentId == 0)
|
||||
if (address == IntPtr.Zero)
|
||||
return null;
|
||||
|
||||
if (address == 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue