From bcf651b5c17e25f48fbc44d96f5837845fd4ee27 Mon Sep 17 00:00:00 2001
From: Haselnussbomber <mail@haselnussbomber.de>
Date: Mon, 6 Oct 2025 01:38:35 +0200
Subject: [PATCH] Fix FavoriteAetherytes

---
 Dalamud/Game/PlayerState/PlayerState.cs | 9 ++++++---
 Dalamud/Plugin/Services/IPlayerState.cs | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dalamud/Game/PlayerState/PlayerState.cs b/Dalamud/Game/PlayerState/PlayerState.cs
index 7af067119..06d57133d 100644
--- a/Dalamud/Game/PlayerState/PlayerState.cs
+++ b/Dalamud/Game/PlayerState/PlayerState.cs
@@ -118,15 +118,18 @@ internal unsafe class PlayerState : IServiceType, IPlayerState
     public RowRef<Aetheryte> HomeAetheryte => this.IsLoaded ? LuminaUtils.CreateRef<Aetheryte>(CSPlayerState.Instance()->HomeAetheryteId) : default;
 
     /// <inheritdoc/>
-    public ReadOnlySpan<RowRef<Aetheryte>> FavouriteAetherytes
+    public ReadOnlySpan<RowRef<Aetheryte>> FavoriteAetherytes
     {
         get
         {
             var playerState = CSPlayerState.Instance();
-            if (playerState->IsLoaded || playerState->FavouriteAetheryteCount == 0)
-                return [];
+            if (!playerState->IsLoaded)
+                return default;
 
             var count = playerState->FavouriteAetheryteCount;
+            if (count == 0)
+                return default;
+
             var array = new RowRef<Aetheryte>[count];
 
             for (var i = 0; i < count; i++)
diff --git a/Dalamud/Plugin/Services/IPlayerState.cs b/Dalamud/Plugin/Services/IPlayerState.cs
index 98b0c36da..bf84227ef 100644
--- a/Dalamud/Plugin/Services/IPlayerState.cs
+++ b/Dalamud/Plugin/Services/IPlayerState.cs
@@ -149,7 +149,7 @@ public interface IPlayerState
     /// <summary>
     /// Gets a span of Aetheryte rows for the local player's favourite aetherytes.
     /// </summary>
-    ReadOnlySpan<RowRef<Aetheryte>> FavouriteAetherytes { get; }
+    ReadOnlySpan<RowRef<Aetheryte>> FavoriteAetherytes { get; }
 
     /// <summary>
     /// Gets the Aetheryte row for the local player's free aetheryte.