Merge pull request #1874 from Jacky720/lts-differentiation

Fix Branch being overwritten less precisely
UnderminersTeam · Aug 22, 2024 · 7715977 · 7715977
2 parents 16679bd + 077ac61
commit 7715977
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/UndertaleModLib/Models/UndertaleGeneralInfo.cs b/UndertaleModLib/Models/UndertaleGeneralInfo.cs
@@ -481,24 +481,13 @@ public void Unserialize(UndertaleReader reader)
         if (reader.ReadOnlyGEN8)
             return;
 
-        var detectedVer = TestForCommonGMSVersions(reader, (Major, Minor, Release, Build, Branch));
-        (Major, Minor, Release, Build, Branch) = detectedVer;
-
-        if (reader.undertaleData.GeneralInfo is not null)
-        {
-            var prevGenInfo = reader.undertaleData.GeneralInfo;
-            // If previous version is greater than current
-            if (prevGenInfo.Major > Major
-                || prevGenInfo.Major == Major && prevGenInfo.Minor > Minor
-                || prevGenInfo.Major == Major && prevGenInfo.Minor == Minor && prevGenInfo.Release > Release
-                || prevGenInfo.Major == Major && prevGenInfo.Minor == Minor && prevGenInfo.Release == Release && prevGenInfo.Build > Build)
-            {
-                Major = prevGenInfo.Major;
-                Minor = prevGenInfo.Minor;
-                Release = prevGenInfo.Release;
-                Build = prevGenInfo.Build;
-            }
-        }
+        // TestForCommonGMSVersions is run during the object counting phase, so the previous general info is always accurate.
+        var prevGenInfo = reader.undertaleData.GeneralInfo;
+        Major = prevGenInfo.Major;
+        Minor = prevGenInfo.Minor;
+        Release = prevGenInfo.Release;
+        Build = prevGenInfo.Build;
+        Branch = prevGenInfo.Branch;
 
         DefaultWindowWidth = reader.ReadUInt32();
         DefaultWindowHeight = reader.ReadUInt32();