short circuit the checks if no RSV data is present

NotAdam · May 16, 2021 · f723d45 · f723d45
1 parent 5649db2
commit f723d45
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/Lumina/Excel/RSV/RsvProvider.cs b/src/Lumina/Excel/RSV/RsvProvider.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using Lumina.Data;
 
 namespace Lumina.Excel.RSV
@@ -19,7 +20,12 @@ public RsvProvider()
             _rsvEntries = new();
         }
 
-        private readonly Dictionary< string, string> _rsvEntries;
+        private readonly Dictionary< string, string > _rsvEntries;
+
+        /// <summary>
+        /// Returns true if there's any RSV values present, otherwise false.
+        /// </summary>
+        public bool HasValues => _rsvEntries.Any();
 
         /// <summary>
         /// Add a RSV mapping for a language to the collection

diff --git a/src/Lumina/Excel/RowParser.cs b/src/Lumina/Excel/RowParser.cs
@@ -210,6 +210,12 @@ public T[] ReadStructuresAsArray< T >( int offset, int count ) where T : struct
 
         private SeString? ReplaceRsvKeyWithValue( byte[] originalData )
         {
+            // so we don't do unnecessary array comparisons
+            if( !Sheet.GameData.Excel.RsvProvider.HasValues )
+            {
+                return null;
+            }
+
             if( originalData.Length < _rsvMagic.Length )
             {
                 return null;