Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-07 00:22:51 +02:00
Adjust some synchronisation
Dieser Commit ist enthalten in:
Ursprung
09c4655be7
Commit
79f4be3941
@ -31,29 +31,31 @@ public abstract class CharBlocks implements IBlocks {
|
||||
};
|
||||
protected final Section empty = new Section() {
|
||||
@Override
|
||||
public synchronized char[] get(CharBlocks blocks, int layer) {
|
||||
public char[] get(CharBlocks blocks, int layer) {
|
||||
// Defaults to aggressive as it should only be avoided where we know we've reset a chunk during an edit
|
||||
return get(blocks, layer, true);
|
||||
}
|
||||
|
||||
@Override
|
||||
public synchronized char[] get(CharBlocks blocks, int layer, boolean aggressive) {
|
||||
char[] arr = blocks.blocks[layer];
|
||||
if (arr == null) {
|
||||
arr = blocks.blocks[layer] = blocks.update(layer, null, aggressive);
|
||||
public char[] get(CharBlocks blocks, int layer, boolean aggressive) {
|
||||
synchronized (this) {
|
||||
char[] arr = blocks.blocks[layer];
|
||||
if (arr == null) {
|
||||
throw new IllegalStateException("Array cannot be null: " + blocks.getClass());
|
||||
arr = blocks.blocks[layer] = blocks.update(layer, null, aggressive);
|
||||
if (arr == null) {
|
||||
throw new IllegalStateException("Array cannot be null: " + blocks.getClass());
|
||||
}
|
||||
} else {
|
||||
blocks.blocks[layer] = blocks.update(layer, arr, aggressive);
|
||||
if (blocks.blocks[layer] == null) {
|
||||
throw new IllegalStateException("Array cannot be null (update): " + blocks.getClass());
|
||||
}
|
||||
}
|
||||
} else {
|
||||
blocks.blocks[layer] = blocks.update(layer, arr, aggressive);
|
||||
if (blocks.blocks[layer] == null) {
|
||||
throw new IllegalStateException("Array cannot be null (update): " + blocks.getClass());
|
||||
if (blocks.blocks[layer] != null) {
|
||||
blocks.sections[layer] = FULL;
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
if (blocks.blocks[layer] != null) {
|
||||
blocks.sections[layer] = FULL;
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -24,7 +24,7 @@ public abstract class CharGetBlocks extends CharBlocks implements IChunkGet {
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean trim(boolean aggressive) {
|
||||
public synchronized boolean trim(boolean aggressive) {
|
||||
for (int i = 0; i < sectionCount; i++) {
|
||||
sections[i] = empty;
|
||||
blocks[i] = null;
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren