merge VersionMetadata property

Type, MType, ReleaseTimeStr
RiversideValley · Nov 7, 2021 · 3433493 · 3433493
1 parent 8191b2f
commit 3433493
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/CmlLib/Core/Version/MVersionCollection.cs b/CmlLib/Core/Version/MVersionCollection.cs
@@ -140,8 +140,22 @@ public virtual void Merge(MVersionCollection from)
         {
             foreach (var item in from)
             {
-                if (!Versions.Contains(item.Name))
+                var version = (MVersionMetadata?)Versions[item.Name];
+                if (version == null)
+                {
                     Versions[item.Name] = item;
+                }
+                else
+                {
+                    if (string.IsNullOrEmpty(version.Type))
+                    {
+                        version.Type = item.Type;
+                        version.MType = MVersionTypeConverter.FromString(item.Type);
+                    }
+
+                    if (string.IsNullOrEmpty(version.ReleaseTimeStr))
+                        version.ReleaseTimeStr = item.ReleaseTimeStr;
+                }
             }
 
             if (this.MinecraftPath == null && from.MinecraftPath != null)