diff --git a/common/net/minecraftforge/common/DimensionManager.java b/common/net/minecraftforge/common/DimensionManager.java
index ff5a354d2..918525f98 100644
--- a/common/net/minecraftforge/common/DimensionManager.java
+++ b/common/net/minecraftforge/common/DimensionManager.java
@@ -326,6 +326,12 @@ public class DimensionManager
         {
             return ((SaveHandler)DimensionManager.getWorld(0).getSaveHandler()).getSaveDirectory();
         }
+        else if (MinecraftServer.getServer() != null)
+        {
+            MinecraftServer srv = MinecraftServer.getServer();
+            SaveHandler saveHandler = (SaveHandler) srv.getActiveAnvilConverter().getSaveLoader(srv.getFolderName(), false);
+            return saveHandler.getSaveDirectory();
+        }
         else
         {
             return null;
diff --git a/fml-src-1.4.7-4.7.19.536-master.zip b/fml-src-1.4.7-4.7.21.538-master.zip
similarity index 98%
rename from fml-src-1.4.7-4.7.19.536-master.zip
rename to fml-src-1.4.7-4.7.21.538-master.zip
index 9969c0df3..4067978f7 100644
Binary files a/fml-src-1.4.7-4.7.19.536-master.zip and b/fml-src-1.4.7-4.7.21.538-master.zip differ