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

Fix LocalBlockVectorSet

Quellcode durchsuchen 
- Fixes #1238
Dieser Commit ist enthalten in:
dordsor21 2021-08-19 13:10:09 +01:00
Ursprung 188e4b6215
Commit 563ad7761a
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 1E53E88969FFCF0B
1 geänderte Dateien mit 12 neuen und 12 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

24
worldedit-core/src/main/java/com/fastasyncworldedit/core/math/LocalBlockVectorSet.java
Datei anzeigen

@ -72,10 +72,10 @@ public class LocalBlockVectorSet implements Set<BlockVector3> {
int b2 = (index >> 8) & 0xff; int b2 = (index >> 8) & 0xff;
int b3 = (index >> 15) & 0xFF; int b3 = (index >> 15) & 0xFF;
int b4 = (index >> 23) & 0xFF; int b4 = (index >> 23) & 0xFF;
int ix = (offsetX + (b3 + (((b2 & 0x7)) << 8)) << 21) >> 21; int ix = offsetX + (((b3 + (((b2 & 0x7)) << 8)) << 21) >> 21);
// Add 128 as we shift y by 128 to fit -256<y<255 // Add 128 as we shift y by 128 to fit -256<y<255
int iy = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1); int iy = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1);
int iz = (offsetZ + (b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21; int iz = offsetZ + (((b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21);
if (Math.abs(ix - x) <= radius && Math.abs(iz - z) <= radius && Math.abs(iy - y) <= radius) { if (Math.abs(ix - x) <= radius && Math.abs(iz - z) <= radius && Math.abs(iy - y) <= radius) {
return true; return true;
} }
@ -118,10 +118,10 @@ public class LocalBlockVectorSet implements Set<BlockVector3> {
int b2 = (index >> 8) & 0xff; int b2 = (index >> 8) & 0xff;
int b3 = (index >> 15) & 0xFF; int b3 = (index >> 15) & 0xFF;
int b4 = (index >> 23) & 0xFF; int b4 = (index >> 23) & 0xFF;
int x = (offsetX + (b3 + (((b2 & 0x7)) << 8)) << 21) >> 21; int x = offsetX + (((b3 + (((b2 & 0x7)) << 8)) << 21) >> 21);
// Add 128 as we shift y by 128 to fit -256<y<255 // Add 128 as we shift y by 128 to fit -256<y<255
int y = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1); int y = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1);
int z = (offsetZ + (b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21; int z = offsetZ + (((b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21);
return MutableBlockVector3.get(x, y, z); return MutableBlockVector3.get(x, y, z);
} }
return null; return null;
@ -152,10 +152,10 @@ public class LocalBlockVectorSet implements Set<BlockVector3> {
int b2 = (index >> 8) & 0xff; int b2 = (index >> 8) & 0xff;
int b3 = (index >> 15) & 0xFF; int b3 = (index >> 15) & 0xFF;
int b4 = (index >> 23) & 0xFF; int b4 = (index >> 23) & 0xFF;
int x = (offsetX + (b3 + (((b2 & 0x7)) << 8)) << 21) >> 21; int x = offsetX + (((b3 + (((b2 & 0x7)) << 8)) << 21) >> 21);
// Add 128 as we shift y by 128 to fit -256<y<255 // Add 128 as we shift y by 128 to fit -256<y<255
int y = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1); int y = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1);
int z = (offsetZ + (b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21; int z = offsetZ + (((b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21);
mutable.mutX(x); mutable.mutX(x);
mutable.mutY(y); mutable.mutY(y);
mutable.mutZ(z); mutable.mutZ(z);
@ -188,10 +188,10 @@ public class LocalBlockVectorSet implements Set<BlockVector3> {
int b2 = (index >> 8) & 0xff; int b2 = (index >> 8) & 0xff;
int b3 = (index >> 15) & 0xFF; int b3 = (index >> 15) & 0xFF;
int b4 = (index >> 23) & 0xFF; int b4 = (index >> 23) & 0xFF;
int x = (offsetX + (b3 + (((b2 & 0x7)) << 8)) << 21) >> 21; int x = offsetX + (((b3 + (((b2 & 0x7)) << 8)) << 21) >> 21);
// Add 128 as we shift y by 128 to fit -256<y<255 // Add 128 as we shift y by 128 to fit -256<y<255
int y = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1); int y = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1);
int z = (offsetZ + (b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21; int z = offsetZ + (((b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21);
array[i] = (T) BlockVector3.at(x, y, z); array[i] = (T) BlockVector3.at(x, y, z);
index++; index++;
} }
@ -305,10 +305,10 @@ public class LocalBlockVectorSet implements Set<BlockVector3> {
int b2 = (index >> 8) & 0xff; int b2 = (index >> 8) & 0xff;
int b3 = (index >> 15) & 0xFF; int b3 = (index >> 15) & 0xFF;
int b4 = (index >> 23) & 0xFF; int b4 = (index >> 23) & 0xFF;
int x = (offsetX + (b3 + (((b2 & 0x7)) << 8)) << 21) >> 21; int x = offsetX + (((b3 + (((b2 & 0x7)) << 8)) << 21) >> 21);
// Add 128 as we shift y by 128 to fit -256<y<255 // Add 128 as we shift y by 128 to fit -256<y<255
int y = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1); int y = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1);
int z = (offsetZ + (b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21; int z = offsetZ + (((b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21);
mVec.mutX(x); mVec.mutX(x);
mVec.mutY(y); mVec.mutY(y);
mVec.mutZ(z); mVec.mutZ(z);
@ -338,10 +338,10 @@ public class LocalBlockVectorSet implements Set<BlockVector3> {
int b2 = (index >> 8) & 0xff; int b2 = (index >> 8) & 0xff;
int b3 = (index >> 15) & 0xFF; int b3 = (index >> 15) & 0xFF;
int b4 = (index >> 23) & 0xFF; int b4 = (index >> 23) & 0xFF;
int x = (offsetX + (b3 + (((b2 & 0x7)) << 8)) << 21) >> 21; int x = offsetX + (((b3 + (((b2 & 0x7)) << 8)) << 21) >> 21);
// Add 128 as we shift y by 128 to fit -256<y<255 // Add 128 as we shift y by 128 to fit -256<y<255
int y = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1); int y = 128 + b1 * (((b2 >> 6) & 0x1) == 0 ? 1 : -1);
int z = (offsetZ + (b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21; int z = offsetZ + (((b4 + (((b2 >> 3) & 0x7) << 8)) << 21) >> 21);
visitor.run(x, y, z, index); visitor.run(x, y, z, index);
} }
} }