diff --git a/Dalamud/Dalamud.csproj b/Dalamud/Dalamud.csproj index 3fce08dd3..af2f810bb 100644 --- a/Dalamud/Dalamud.csproj +++ b/Dalamud/Dalamud.csproj @@ -6,7 +6,7 @@ XIV Launcher addon framework - 12.0.1.5 + 13.0.0.0 $(DalamudVersion) $(DalamudVersion) $(DalamudVersion) diff --git a/Dalamud/Game/NativeWrapper/AtkValuePtr.cs b/Dalamud/Game/NativeWrapper/AtkValuePtr.cs index 005906e20..a47483a66 100644 --- a/Dalamud/Game/NativeWrapper/AtkValuePtr.cs +++ b/Dalamud/Game/NativeWrapper/AtkValuePtr.cs @@ -69,7 +69,7 @@ public readonly unsafe struct AtkValuePtr(nint address) : IEquatable this.Struct->UInt, AtkValueType.UInt64 => this.Struct->UInt64, AtkValueType.Float => this.Struct->Float, - AtkValueType.String or AtkValueType.String8 or AtkValueType.ManagedString => this.Struct->String == null ? default : this.Struct->String.AsReadOnlySeString(), + AtkValueType.String or AtkValueType.String8 or AtkValueType.ManagedString => this.Struct->String.HasValue ? this.Struct->String.AsReadOnlySeString() : default, AtkValueType.WideString => this.Struct->WideString == null ? string.Empty : new string(this.Struct->WideString), AtkValueType.Pointer => (nint)this.Struct->Pointer, _ => throw new NotImplementedException($"AtkValueType {this.ValueType} is currently not supported"),