Okay, back to arbitrary offsets!

src/main/java/net/minecraft/server/WorldMap.java

@@ -37,15 +37,17 @@ public class WorldMap extends WorldMapBase {
         // CraftBukkit start
         byte dimension = nbttagcompound.c("dimension");
 
-        this.worldUID = nbttagcompound.getLong("WorldUID");
+        if (dimension >= 10) {
-        CraftWorld world = (CraftWorld) server.getWorld(this.worldUID);
+            this.worldUID = nbttagcompound.getLong("WorldUID");
-        // Check if the stored world details are correct.
+            CraftWorld world = (CraftWorld) server.getWorld(this.worldUID);
-        if (world == null) {
+            // Check if the stored world details are correct.
-            /* All Maps which do not have their valid world loaded are set to a dimension which hopefully won't be reached.
+            if (world == null) {
-               This is to prevent them being corrupted with the wrong map data. */
+                /* All Maps which do not have their valid world loaded are set to a dimension which hopefully won't be reached.
-            dimension = 127;
+                   This is to prevent them being corrupted with the wrong map data. */
-        } else {
+                dimension = 127;
-            dimension = (byte) world.getHandle().dimension;
+            } else {
+                dimension = (byte) world.getHandle().dimension;
+            }
         }
 
         this.map = dimension;

src/main/java/org/bukkit/craftbukkit/CraftServer.java

@@ -393,7 +393,7 @@ public final class CraftServer implements Server {
             converter.convert(name, new ConvertProgressUpdater(console));
         }
 
-        int dimension = Environment.values().length + 1 + console.worlds.size();
+        int dimension = 10 + console.worlds.size();
         WorldServer internal = new WorldServer(console, new ServerNBTManager(new File("."), name, true), name, dimension, seed, environment, generator);
         internal.worldMaps = console.worlds.get(0).worldMaps;