keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Deleted unneeded server side patches, Packet250 bug was fixed. And the others got moved to AnvilSaveHandler

Browse source
This commit is contained in:
LexManos 2012-03-04 20:45:15 -08:00
parent 9d626d9e5e
commit 70388dd607
4 changed files with 20 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
forge/patches/minecraft_server/net/minecraft/src/AnvilSaveHandler.java.patch Normal file
View file

@ -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);
}

11
forge/patches/minecraft_server/net/minecraft/src/Packet250CustomPayload.java.patch
View file

@ -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);
}
}

24
forge/patches/minecraft_server/net/minecraft/src/PlayerNBTManager.java.patch
View file

@ -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
{

30
forge/patches/minecraft_server/net/minecraft/src/SaveOldDir.java.patch
View file

@ -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());
}
}