Ensure VersionMigrator is applied in the correct order

Multiverse · Feb 28, 2025 · cfd7be2 · cfd7be2
1 parent 74e595b
commit cfd7be2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/migration/ConfigMigrator.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/ConfigMigrator.java
@@ -1,6 +1,7 @@
 package org.mvplugins.multiverse.core.configuration.migration;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 import com.dumptruckman.minecraft.util.Logging;
@@ -43,8 +44,8 @@ public void migrate(ConfigurationSection config) {
             return;
         }
 
-        double versionNumber = config.getDouble(versionNode.getPath());
         for (VersionMigrator versionMigrator : versionMigrators) {
+            double versionNumber = config.getDouble(versionNode.getPath());
             if (versionNumber < versionMigrator.getVersion()) {
                 Logging.info("Migrating config from version %s to %s...", versionNumber, versionMigrator.getVersion());
                 versionMigrator.migrate(config);
@@ -101,6 +102,7 @@ public Builder addVersionMigrator(VersionMigrator versionMigrator) {
          * @return The built ConfigMigrator.
          */
         public ConfigMigrator build() {
+            Collections.sort(versionMigrators);
             return new ConfigMigrator(versionNode, versionMigrators);
         }
     }

diff --git a/src/main/java/org/mvplugins/multiverse/core/configuration/migration/VersionMigrator.java b/src/main/java/org/mvplugins/multiverse/core/configuration/migration/VersionMigrator.java
@@ -4,11 +4,12 @@
 import java.util.List;
 
 import org.bukkit.configuration.ConfigurationSection;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * A version migrator is a collection of migrator actions that are performed when migrating a config to a specific version.
  */
-public class VersionMigrator {
+public class VersionMigrator implements Comparable<VersionMigrator> {
 
     /**
      * Creates a new builder for a VersionMigrator.
@@ -46,6 +47,11 @@ public double getVersion() {
         return version;
     }
 
+    @Override
+    public int compareTo(@NotNull VersionMigrator o) {
+        return Double.compare(version, o.version);
+    }
+
     /**
      * A builder for a VersionMigrator.
      */