SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Projekte Releases Wiki Aktivität

Fixed vanilla issue where chunks would be mislocated and corrupt. Big thanks to Wug for the fix.

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Nathan Adams 2012-01-30 04:27:25 +00:00
Ursprung 72559fe634
Commit 875219e28c
2 geänderte Dateien mit 6 neuen und 10 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

4
src/main/java/net/minecraft/server/ChunkLoader.java
Datei anzeigen

@ -67,8 +67,8 @@ public class ChunkLoader implements IChunkLoader {
if (!chunk.a(i, j)) { if (!chunk.a(i, j)) {
System.out.println("Chunk file at " + i + "," + j + " is in the wrong location; relocating. (Expected " + i + ", " + j + ", got " + chunk.x + ", " + chunk.z + ")"); System.out.println("Chunk file at " + i + "," + j + " is in the wrong location; relocating. (Expected " + i + ", " + j + ", got " + chunk.x + ", " + chunk.z + ")");
nbttagcompound.setInt("xPos", i); nbttagcompound.getCompound("Level").setInt("xPos", i); // CraftBukkit - .getCompound("Level")
nbttagcompound.setInt("zPos", j); nbttagcompound.getCompound("Level").setInt("zPos", j); // CraftBukkit - .getCompound("Level")
chunk = a(world, nbttagcompound.getCompound("Level")); chunk = a(world, nbttagcompound.getCompound("Level"));
} }

12
src/main/java/net/minecraft/server/ChunkRegionLoader.java
Datei anzeigen

@ -1,10 +1,6 @@
package net.minecraft.server; package net.minecraft.server;
import java.io.DataInput; import java.io.*;
import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
@ -58,8 +54,8 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
if (!chunk.a(i, j)) { if (!chunk.a(i, j)) {
System.out.println("Chunk file at " + i + "," + j + " is in the wrong location; relocating. (Expected " + i + ", " + j + ", got " + chunk.x + ", " + chunk.z + ")"); System.out.println("Chunk file at " + i + "," + j + " is in the wrong location; relocating. (Expected " + i + ", " + j + ", got " + chunk.x + ", " + chunk.z + ")");
nbttagcompound.setInt("xPos", i); nbttagcompound.getCompound("Level").setInt("xPos", i); // CraftBukkit - .getCompound("Level")
nbttagcompound.setInt("zPos", j); nbttagcompound.getCompound("Level").setInt("zPos", j); // CraftBukkit - .getCompound("Level")
chunk = ChunkLoader.a(world, nbttagcompound.getCompound("Level")); chunk = ChunkLoader.a(world, nbttagcompound.getCompound("Level"));
} }
@ -126,7 +122,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
return true; return true;
} }
public void a(PendingChunkToSave pendingchunktosave) { public void a(PendingChunkToSave pendingchunktosave) throws IOException { // CraftBukkit - Added throws
DataOutputStream dataoutputstream = RegionFileCache.c(this.d, pendingchunktosave.a.x, pendingchunktosave.a.z); DataOutputStream dataoutputstream = RegionFileCache.c(this.d, pendingchunktosave.a.x, pendingchunktosave.a.z);
NBTCompressedStreamTools.a(pendingchunktosave.b, (DataOutput) dataoutputstream); NBTCompressedStreamTools.a(pendingchunktosave.b, (DataOutput) dataoutputstream);