Merge remote-tracking branch 'origin/master' into exdschema_support

NotAdam · Oct 21, 2023 · dcdb077 · dcdb077
2 parents b66fd36 + 48c15e2
commit dcdb077
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Lumina/Excel/ExcelSheetImpl.cs b/src/Lumina/Excel/ExcelSheetImpl.cs
@@ -152,7 +152,14 @@ internal void GenerateFilePages()
         /// <returns>The <see cref="ExcelPage"/> if found, null otherwise</returns>
         public ExcelPage? GetPageForRow( uint row )
         {
-            return DataPages.FirstOrDefault( s => s.RowData.ContainsKey( row ) );
+            var page = DataPages.FirstOrDefault( s => row >= s.StartId && row < s.StartId + s.RowCount );
+
+            if( page?.RowData.ContainsKey( row ) == false )
+            {
+                return null;
+            }
+
+            return page;
         }
 
         /// <summary>