diff --git a/forge/patches/minecraft_server/net/minecraft/src/AnvilSaveHandler.java.patch b/forge/patches/minecraft_server/net/minecraft/src/AnvilSaveHandler.java.patch new file mode 100644 index 0000000000..6bf81620e5 --- /dev/null +++ b/forge/patches/minecraft_server/net/minecraft/src/AnvilSaveHandler.java.patch @@ -0,0 +1,20 @@ +--- ../src_base/minecraft_server/net/minecraft/src/AnvilSaveHandler.java 0000-00-00 00:00:00.000000000 -0000 ++++ ../src_work/minecraft_server/net/minecraft/src/AnvilSaveHandler.java 0000-00-00 00:00:00.000000000 -0000 +@@ -18,15 +18,9 @@ + File var2 = this.getWorldDirectory(); + 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_server/net/minecraft/src/Packet250CustomPayload.java.patch b/forge/patches/minecraft_server/net/minecraft/src/Packet250CustomPayload.java.patch deleted file mode 100644 index 3bcf5a6e18..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/Packet250CustomPayload.java.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/Packet250CustomPayload.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/Packet250CustomPayload.java 0000-00-00 00:00:00.000000000 -0000 -@@ -20,7 +20,7 @@ - if (length > 0 && length < 32767) - { - data = new byte[length]; -- datainputstream.read(data); -+ datainputstream.readFully(data); - } - } - diff --git a/forge/patches/minecraft_server/net/minecraft/src/PlayerNBTManager.java.patch b/forge/patches/minecraft_server/net/minecraft/src/PlayerNBTManager.java.patch deleted file mode 100644 index 3a22bdf393..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/PlayerNBTManager.java.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/PlayerNBTManager.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/PlayerNBTManager.java 0000-00-00 00:00:00.000000000 -0000 -@@ -82,17 +82,11 @@ - - public IChunkLoader getChunkLoader(WorldProvider worldprovider) - { -- if (worldprovider instanceof WorldProviderHell) -+ if (worldprovider.getSaveFolder() != null) - { -- File file = new File(worldDirectory, "DIM-1"); -- file.mkdirs(); -- return new ChunkLoader(file, true); -- } -- if (worldprovider instanceof WorldProviderEnd) -- { -- File file1 = new File(worldDirectory, "DIM1"); -- file1.mkdirs(); -- return new ChunkLoader(file1, true); -+ File dir = new File(worldDirectory, worldprovider.getSaveFolder()); -+ dir.mkdirs(); -+ return new ChunkLoader(dir, true); - } - else - { diff --git a/forge/patches/minecraft_server/net/minecraft/src/SaveOldDir.java.patch b/forge/patches/minecraft_server/net/minecraft/src/SaveOldDir.java.patch deleted file mode 100644 index d383a354de..0000000000 --- a/forge/patches/minecraft_server/net/minecraft/src/SaveOldDir.java.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- ../src_base/minecraft_server/net/minecraft/src/SaveOldDir.java 0000-00-00 00:00:00.000000000 -0000 -+++ ../src_work/minecraft_server/net/minecraft/src/SaveOldDir.java 0000-00-00 00:00:00.000000000 -0000 -@@ -12,22 +12,15 @@ - - public IChunkLoader getChunkLoader(WorldProvider worldprovider) - { -- File file = getWorldDirectory(); -- if (worldprovider instanceof WorldProviderHell) -+ if (worldprovider.getSaveFolder() != null) - { -- File file1 = new File(file, "DIM-1"); -- file1.mkdirs(); -- return new ThreadedChunkLoader(file1); -- } -- if (worldprovider instanceof WorldProviderEnd) -- { -- File file2 = new File(file, "DIM1"); -- file2.mkdirs(); -- return new ThreadedChunkLoader(file2); -+ File dir = new File(getWorldDirectory(), worldprovider.getSaveFolder()); -+ dir.mkdirs(); -+ return new ThreadedChunkLoader(dir); - } - else - { -- return new ThreadedChunkLoader(file); -+ return new ThreadedChunkLoader(getWorldDirectory()); - } - } -