From e96e496e053dc53d3d3c3189c4dd011bb334023f Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 4 Mar 2012 03:08:22 -0800 Subject: [PATCH] Same patch diff, files. --- .../minecraft/src/AnvilSaveHandler.java.patch | 20 ++++++++++++++++ .../net/minecraft/src/SaveOldDir.java.patch | 23 ------------------- 2 files changed, 20 insertions(+), 23 deletions(-) create mode 100644 forge/patches/minecraft/net/minecraft/src/AnvilSaveHandler.java.patch delete mode 100644 forge/patches/minecraft/net/minecraft/src/SaveOldDir.java.patch diff --git a/forge/patches/minecraft/net/minecraft/src/AnvilSaveHandler.java.patch b/forge/patches/minecraft/net/minecraft/src/AnvilSaveHandler.java.patch new file mode 100644 index 0000000000..b467c15e4b --- /dev/null +++ b/forge/patches/minecraft/net/minecraft/src/AnvilSaveHandler.java.patch @@ -0,0 +1,20 @@ +--- ../src_base/minecraft/net/minecraft/src/AnvilSaveHandler.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft/net/minecraft/src/AnvilSaveHandler.java 0000-00-00 00:00:00.000000000 -0000 +@@ -18,15 +18,9 @@ + File var2 = this.getSaveDirectory(); + File var3; + +- if (par1WorldProvider instanceof WorldProviderHell) ++ if (par1WorldProvider.getSaveFolder() != null) + { +- var3 = new File(var2, "DIM-1"); +- var3.mkdirs(); +- return new AnvilChunkLoader(var3); +- } +- else if (par1WorldProvider instanceof WorldProviderEnd) +- { +- var3 = new File(var2, "DIM1"); ++ var3 = new File(var2, par1WorldProvider.getSaveFolder()); + var3.mkdirs(); + return new AnvilChunkLoader(var3); + } diff --git a/forge/patches/minecraft/net/minecraft/src/SaveOldDir.java.patch b/forge/patches/minecraft/net/minecraft/src/SaveOldDir.java.patch deleted file mode 100644 index ab665a02fe..0000000000 --- a/forge/patches/minecraft/net/minecraft/src/SaveOldDir.java.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- ../src_base/minecraft/net/minecraft/src/SaveOldDir.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft/net/minecraft/src/SaveOldDir.java 0000-00-00 00:00:00.000000000 -0000 -@@ -13,18 +13,12 @@ - public IChunkLoader getChunkLoader(WorldProvider worldprovider) - { - File file = getSaveDirectory(); -- if (worldprovider instanceof WorldProviderHell) -+ if (worldprovider.getSaveFolder() != null) - { -- File file1 = new File(file, "DIM-1"); -+ File file1 = new File(file, worldprovider.getSaveFolder()); - file1.mkdirs(); - return new ThreadedChunkLoader(file1); - } -- if (worldprovider instanceof WorldProviderEnd) -- { -- File file2 = new File(file, "DIM1"); -- file2.mkdirs(); -- return new ThreadedChunkLoader(file2); -- } - else - { - return new ThreadedChunkLoader(file);