Mirrors/FastAsyncWorldEdit
3
0
Fork 1
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-12-25 18:40:05 +01:00
Code Issues Projekte Releases Wiki Aktivität

Synchronise chunk filtering

Quellcode durchsuchen
Dieser Commit ist enthalten in:
dordsor21 2021-11-02 13:34:37 +00:00
Ursprung d8735da871
Commit 0674f39600
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 1E53E88969FFCF0B
2 geänderte Dateien mit 10 neuen und 10 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

16
worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/CharFilterBlock.java
Datei anzeigen

@ -56,7 +56,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
} }
@Override @Override
public final ChunkFilterBlock initChunk(int chunkX, int chunkZ) { public synchronized final ChunkFilterBlock initChunk(int chunkX, int chunkZ) {
this.chunkX = chunkX; this.chunkX = chunkX;
this.chunkZ = chunkZ; this.chunkZ = chunkZ;
this.xx = chunkX << 4; this.xx = chunkX << 4;
@ -65,7 +65,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
} }
@Override @Override
public final ChunkFilterBlock initLayer(IBlocks iget, IChunkSet iset, int layer) { public synchronized final ChunkFilterBlock initLayer(IBlocks iget, IChunkSet iset, int layer) {
this.get = (CharGetBlocks) iget; this.get = (CharGetBlocks) iget;
minLayer = this.get.getMinSectionPosition(); minLayer = this.get.getMinSectionPosition();
maxLayer = this.get.getMaxSectionPosition(); maxLayer = this.get.getMaxSectionPosition();
@ -88,7 +88,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
} }
@Override @Override
public void flood( public synchronized void flood(
IChunkGet iget, IChunkSet iset, int layer, Flood flood, IChunkGet iget, IChunkSet iset, int layer, Flood flood,
FilterBlockMask mask FilterBlockMask mask
) { ) {
@ -114,7 +114,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
} }
@Override @Override
public void filter(Filter filter, int x, int y, int z) { public synchronized void filter(Filter filter, int x, int y, int z) {
this.x = x; this.x = x;
this.y = y; this.y = y;
this.z = z; this.z = z;
@ -123,7 +123,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
} }
@Override @Override
public void filter(Filter filter, int startY, int endY) { public synchronized void filter(Filter filter, int startY, int endY) {
for (y = startY, index = startY << 8; y <= endY; y++) { for (y = startY, index = startY << 8; y <= endY; y++) {
for (z = 0; z < 16; z++) { for (z = 0; z < 16; z++) {
for (x = 0; x < 16; x++, index++) { for (x = 0; x < 16; x++, index++) {
@ -134,7 +134,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
} }
@Override @Override
public void filter(Filter filter, int minX, int minY, int minZ, int maxX, int maxY, int maxZ) { public synchronized void filter(Filter filter, int minX, int minY, int minZ, int maxX, int maxY, int maxZ) {
int yis = minY << 8; int yis = minY << 8;
int zis = minZ << 4; int zis = minZ << 4;
int zie = (15 - maxZ) << 4; int zie = (15 - maxZ) << 4;
@ -153,7 +153,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
} }
@Override @Override
public final void filter(Filter filter, Region region) { public synchronized final void filter(Filter filter, Region region) {
for (y = 0, index = 0; y < 16; y++) { for (y = 0, index = 0; y < 16; y++) {
int absY = yy + y; int absY = yy + y;
for (z = 0; z < 16; z++) { for (z = 0; z < 16; z++) {
@ -169,7 +169,7 @@ public class CharFilterBlock extends ChunkFilterBlock {
} }
@Override @Override
public final void filter(Filter filter) { public synchronized final void filter(Filter filter) {
for (y = 0, index = 0; y < 16; y++) { for (y = 0, index = 0; y < 16; y++) {
for (z = 0; z < 16; z++) { for (z = 0; z < 16; z++) {
for (x = 0; x < 16; x++, index++) { for (x = 0; x < 16; x++, index++) {

4
worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/filter/block/ChunkFilterBlock.java
Datei anzeigen

@ -69,7 +69,7 @@ public abstract class ChunkFilterBlock extends AbstractExtentFilterBlock {
/** /**
* Filter with a chunk object. * Filter with a chunk object.
*/ */
public final IChunkSet filter(IChunk chunk, IChunkGet get, IChunkSet set, Filter filter) { public synchronized final IChunkSet filter(IChunk chunk, IChunkGet get, IChunkSet set, Filter filter) {
initChunk(chunk.getX(), chunk.getZ()); initChunk(chunk.getX(), chunk.getZ());
for (int layer = get.getMinSectionPosition(); layer <= get.getMaxSectionPosition(); layer++) { for (int layer = get.getMinSectionPosition(); layer <= get.getMaxSectionPosition(); layer++) {
if (set.hasSection(layer)) { if (set.hasSection(layer)) {
@ -83,7 +83,7 @@ public abstract class ChunkFilterBlock extends AbstractExtentFilterBlock {
/** /**
* Filter a chunk with a region / filter. * Filter a chunk with a region / filter.
*/ */
public final IChunkSet filter(IChunk chunk, IChunkGet get, IChunkSet set, Filter filter, Region region, boolean full) { public synchronized final IChunkSet filter(IChunk chunk, IChunkGet get, IChunkSet set, Filter filter, Region region, boolean full) {
if (region != null) { if (region != null) {
region.filter(chunk, filter, this, get, set, full); region.filter(chunk, filter, this, get, set, full);
} else { } else {