3
0
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:
Jordan 2024-08-07 07:56:33 +02:00 committet von GitHub
Ursprung 1a827fa8c1
Commit fcbd346d8f
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: B5690EEEBB952194

Datei anzeigen

@ -31,7 +31,9 @@ public abstract class CharBlocks implements IBlocks {
char[] arr = blocks.blocks[layer]; char[] arr = blocks.blocks[layer];
if (arr == null) { if (arr == null) {
// Chunk probably trimmed mid-operations, but do nothing about it to avoid other issues // 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; return arr;
} }
@ -54,22 +56,7 @@ public abstract class CharBlocks implements IBlocks {
if (blocks.sections[layer] == FULL) { if (blocks.sections[layer] == FULL) {
return FULL.get(blocks, layer); return FULL.get(blocks, layer);
} }
char[] arr = blocks.blocks[layer]; return getSkipFull(blocks, layer, aggressive);
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;
} }
} }
@ -262,6 +249,25 @@ public abstract class CharBlocks implements IBlocks {
get(blocks, layer)[index] = value; 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;
}
} }
} }