Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-09-19 22:08:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not StackOverflow when getting a section in FULL after awkward trim (#2863)

Browse Source
This commit is contained in:
Jordan 2024-08-07 07:56:33 +02:00 committed by GitHub
parent 1a827fa8c1
commit fcbd346d8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
worldedit-core/src/main/java/com/fastasyncworldedit/core/queue/implementation/blocks/CharBlocks.java
View File

@ -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;
}
} }
} }