Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-11-17 00:20:09 +01:00
fix: do not StackOverflow when getting a section in FULL after awkward trim (#2863)
Dieser Commit ist enthalten in:
Ursprung
1a827fa8c1
Commit
fcbd346d8f
@ -31,7 +31,9 @@ public abstract class CharBlocks implements IBlocks {
|
||||
char[] arr = blocks.blocks[layer];
|
||||
if (arr == null) {
|
||||
// Chunk probably trimmed mid-operations, but do nothing about it to avoid other issues
|
||||
return EMPTY.get(blocks, layer, false);
|
||||
synchronized (blocks.sectionLocks[layer]) {
|
||||
return getSkipFull(blocks, layer, aggressive);
|
||||
}
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
@ -54,22 +56,7 @@ public abstract class CharBlocks implements IBlocks {
|
||||
if (blocks.sections[layer] == FULL) {
|
||||
return FULL.get(blocks, layer);
|
||||
}
|
||||
char[] arr = blocks.blocks[layer];
|
||||
if (arr == null) {
|
||||
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());
|
||||
}
|
||||
}
|
||||
if (blocks.blocks[layer] != null) {
|
||||
blocks.sections[layer] = FULL;
|
||||
}
|
||||
return arr;
|
||||
return getSkipFull(blocks, layer, aggressive);
|
||||
}
|
||||
}
|
||||
|
||||
@ -262,6 +249,25 @@ public abstract class CharBlocks implements IBlocks {
|
||||
get(blocks, layer)[index] = value;
|
||||
}
|
||||
|
||||
static char[] getSkipFull(CharBlocks blocks, int layer, boolean aggressive) {
|
||||
char[] arr = blocks.blocks[layer];
|
||||
if (arr == null) {
|
||||
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());
|
||||
}
|
||||
}
|
||||
if (blocks.blocks[layer] != null) {
|
||||
blocks.sections[layer] = FULL;
|
||||
}
|
||||
return arr;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren