Merge remote-tracking branch 'origin/master' into api14-rollup

Dalamud/Configuration/Internal/DalamudConfiguration.cs

@@ -487,6 +487,14 @@ internal sealed class DalamudConfiguration : IInternalDisposableService
     /// </summary>
     public Vector2 NotificationAnchorPosition { get; set; } = new(1f, 1f);
 
+#pragma warning disable SA1600
+#pragma warning disable SA1516
+    // XLCore/XoM compatibility until they move it out
+    public string? DalamudBetaKey { get; set; } = null;
+    public string? DalamudBetaKind { get; set; }
+#pragma warning restore SA1516
+#pragma warning restore SA1600
+
     /// <summary>
     /// Load a configuration from the provided path.
     /// </summary>

Dalamud/Dalamud.csproj

@@ -6,7 +6,7 @@
 
     <PropertyGroup Label="Feature">
         <Description>XIV Launcher addon framework</Description>
-        <DalamudVersion>13.0.0.11</DalamudVersion>
+        <DalamudVersion>13.0.0.12</DalamudVersion>
         <AssemblyVersion>$(DalamudVersion)</AssemblyVersion>
         <Version>$(DalamudVersion)</Version>
         <FileVersion>$(DalamudVersion)</FileVersion>

Dalamud/Game/Player/PlayerState.cs

@@ -77,7 +77,7 @@ internal unsafe class PlayerState : IServiceType, IPlayerState
     public RowRef<ClassJob> ClassJob => this.IsLoaded ? LuminaUtils.CreateRef<ClassJob>(CSPlayerState.Instance()->CurrentClassJobId) : default;
 
     /// <inheritdoc/>
-    public short Level => this.IsLoaded ? CSPlayerState.Instance()->CurrentLevel : default;
+    public short Level => this.IsLoaded && this.ClassJob.IsValid ? this.GetClassJobLevel(this.ClassJob.Value) : this.EffectiveLevel;
 
     /// <inheritdoc/>
     public bool IsLevelSynced => this.IsLoaded && CSPlayerState.Instance()->IsLevelSynced;

Dalamud/Plugin/Services/IPlayerState.cs

@@ -79,7 +79,7 @@ public interface IPlayerState : IDalamudService
     bool IsLevelSynced { get; }
 
     /// <summary>
-    /// Gets the effective level of the local character.
+    /// Gets the effective level of the local character, taking level sync into account.
     /// </summary>
     short EffectiveLevel { get; }