diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8bc34133..c0a4ed72 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -91,7 +91,9 @@ public interface Server {
     public List<World> getWorlds();
 
     /**
-     * Creates or loads a world with the given name
+     * Creates or loads a world with the given name.
+     * If the world is already loaded, it will just return the equivalent of
+     * getWorld(name)
      *
      * @param name Name of the world to load
      * @param environment Environment type of the world
@@ -99,6 +101,14 @@ public interface Server {
      */
     public World createWorld(String name, World.Environment environment);
 
+    /**
+     * Gets the world with the given name
+     *
+     * @param name Name of the world to retrieve
+     * @return World with the given name, or null if none exists
+     */
+    public World getWorld(String name);
+
     /**
      * Reloads the server, refreshing settings and plugin information
      */