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

Revert "~1/3 faster history writing with small caching"

Quellcode durchsuchen 
This reverts commit 836b7a9750.
Dieser Commit ist enthalten in:
dordsor21 2021-01-05 00:50:26 +00:00
Ursprung 836b7a9750
Commit bfd04e4155
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 1E53E88969FFCF0B
1 geänderte Dateien mit 12 neuen und 25 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

37
worldedit-core/src/main/java/com/boydti/fawe/object/changeset/FaweStreamChangeSet.java
Datei anzeigen

@ -132,9 +132,6 @@ public abstract class FaweStreamChangeSet extends AbstractChangeSet {
int lx;
int ly;
int lz;
// 16*16*4
byte[] buff = new byte[1024];
int index = 0;
@Override
public void write(OutputStream out, int x, int y, int z) throws IOException {
@ -147,16 +144,13 @@ public abstract class FaweStreamChangeSet extends AbstractChangeSet {
int x16 = (rx >> 8) & 0xF;
int z16 = (rz >> 8) & 0xF;
byte b4 = MathMan.pair16(x16, z16);
System.arraycopy(new byte[] {b1, b2, b3, b4}, 0, buff, index, 4);
index += 4;
if (index == 1024) {
out.write(buff);
buff = new byte[1024];
index = 0;
}
out.write(b1);
out.write(b2);
out.write(b3);
out.write(b4);
}
final byte[] buffer = new byte[4];
byte[] buffer = new byte[4];
@Override
public int readX(FaweInputStream in) throws IOException {
@ -176,30 +170,23 @@ public abstract class FaweStreamChangeSet extends AbstractChangeSet {
};
} else {
posDel = new FaweStreamPositionDelegate() {
final byte[] buffer = new byte[5];
int lx;
int ly;
int lz;
// 16*16*5
byte[] buff = new byte[1280];
int index = 0;
@Override
public void write(OutputStream out, int x, int y, int z) throws IOException {
public void write(OutputStream stream, int x, int y, int z) throws IOException {
int rx = -lx + (lx = x);
int ry = -ly + (ly = y);
int rz = -lz + (lz = z);
System.arraycopy(new byte[] {(byte) ((rx) & 0xff), (byte) (((rx) >> 8) & 0xff), (byte) ((rz) & 0xff),
(byte) (((rz) >> 8) & 0xff), (byte) ry}, 0, buff, index, 5);
index += 5;
if (index == 1280) {
out.write(buff);
buff = new byte[1280];
index = 0;
}
stream.write((rx) & 0xff);
stream.write(((rx) >> 8) & 0xff);
stream.write((rz) & 0xff);
stream.write(((rz) >> 8) & 0xff);
stream.write((byte) ry);
}
final byte[] buffer = new byte[5];
@Override
public int readX(FaweInputStream is) throws IOException {
is.readFully(buffer);