Possibly fixes some of the issues with IC2, at least for default worlds.

2012-07-12 14:29:05 -04:00
1 changed files with 10 additions and 7 deletions
@@ -14,6 +14,7 @@ import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
 import com.onarandombox.MultiverseCore.api.WorldPurger;
 import com.onarandombox.MultiverseCore.event.MVWorldDeleteEvent;
+import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.World.Environment;
 import org.bukkit.WorldCreator;
@@ -288,13 +289,15 @@ public class WorldManager implements MVWorldManager {
        if (worlds.containsKey(worldName))
            throw new IllegalArgumentException("That world is already loaded!");
        MVWorld mvworld = worldsFromTheConfig.get(worldName);
-        World cbworld;
-        try {
-            cbworld = creator.createWorld();
-        } catch (Exception e) {
-            e.printStackTrace();
-            brokenWorld(worldName);
-            return false;
+        World cbworld = Bukkit.getWorld(worldName);
+        if (cbworld == null) {
+            try {
+                cbworld = creator.createWorld();
+            } catch (Exception e) {
+                e.printStackTrace();
+                brokenWorld(worldName);
+                return false;
+            }
        }
        mvworld.init(cbworld, plugin);
        this.worldPurger.purgeWorld(mvworld);