3 files changed, 20 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 45728ccf..c051209d 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1,6 +1,7 @@
 package org.bukkit;
 
 import com.avaje.ebean.config.ServerConfig;
+import java.io.File;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -281,4 +282,8 @@ public final class Bukkit {
     public static Set<OfflinePlayer> getOperators() {
         return server.getOperators();
     }
+
+    public static File getWorldContainer() {
+        return server.getWorldContainer();
+    }
 }
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3870bd80..dc9ce803 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -511,4 +511,11 @@ public interface Server {
      * @return The Console CommandSender
      */
     public ConsoleCommandSender getConsoleSender();
+
+    /**
+     * Gets the folder that contains all of the various {@link World}s.
+     *
+     * @return World container folder
+     */
+    public File getWorldContainer();
 }
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 51fa3a53..2ecb8a95 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -1,5 +1,6 @@
 package org.bukkit;
 
+import java.io.File;
 import org.bukkit.generator.ChunkGenerator;
 import java.util.HashMap;
 import java.util.List;
@@ -740,6 +741,13 @@ public interface World {
     public Difficulty getDifficulty();
 
     /**
+     * Gets the folder of this world on disk.
+     *
+     * @return The folder of this world.
+     */
+    public File getWorldFolder();
+
+    /**
      * Represents various map environment types that a world may be
      */
     public enum Environment {