Skip to content

fix: alter synchronisation of getblocks trim implementation #3288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dordsor21 merged 2 commits into from
Oct 13, 2025
Merged

fix: alter synchronisation of getblocks trim implementation #3288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1178070
fix: alter synchronisation of getblocks trim implementation
dordsor21 Aug 18, 2025
f7c5a7c
Merge branch 'main' into fix/adapter-getblocks-synchronisation
NotMyFault Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 21 additions & 11 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,19 +1001,29 @@ public boolean hasNonEmptySection(int layer) {

@Override
@SuppressWarnings("unchecked")
public synchronized boolean trim(boolean aggressive) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
public boolean trim(boolean aggressive) {
synchronized (this) {
if (sections == null && (!aggressive || levelChunk == null)) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
return !aggressive || super.trim(true);
}
}
if (aggressive) {
sectionLock.writeLock().lock();
sections = null;
levelChunk = null;
sectionLock.writeLock().unlock();
return super.trim(true);
} else if (sections == null) {
// don't bother trimming if there are no sections stored.
return true;
} else {
try {
synchronized (this) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
sections = null;
levelChunk = null;
return super.trim(true);
}
} finally {
sectionLock.writeLock().unlock();
}
}
synchronized (this) {
for (int i = getMinSectionPosition(); i <= getMaxSectionPosition(); i++) {
int layer = i - getMinSectionPosition();
if (!hasSection(i) || super.blocks[layer] == null) {
Expand Down
32 changes: 21 additions & 11 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,19 +1002,29 @@ public boolean hasNonEmptySection(int layer) {

@Override
@SuppressWarnings("unchecked")
public synchronized boolean trim(boolean aggressive) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
public boolean trim(boolean aggressive) {
synchronized (this) {
if (sections == null && (!aggressive || levelChunk == null)) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
return !aggressive || super.trim(true);
}
}
if (aggressive) {
sectionLock.writeLock().lock();
sections = null;
levelChunk = null;
sectionLock.writeLock().unlock();
return super.trim(true);
} else if (sections == null) {
// don't bother trimming if there are no sections stored.
return true;
} else {
try {
synchronized (this) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
sections = null;
levelChunk = null;
return super.trim(true);
}
} finally {
sectionLock.writeLock().unlock();
}
}
synchronized (this) {
for (int i = getMinSectionPosition(); i <= getMaxSectionPosition(); i++) {
int layer = i - getMinSectionPosition();
if (!hasSection(i) || super.blocks[layer] == null) {
Expand Down
32 changes: 21 additions & 11 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,19 +1003,29 @@ public boolean hasNonEmptySection(int layer) {

@Override
@SuppressWarnings("unchecked")
public synchronized boolean trim(boolean aggressive) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
public boolean trim(boolean aggressive) {
synchronized (this) {
if (sections == null && (!aggressive || levelChunk == null)) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
return !aggressive || super.trim(true);
}
}
if (aggressive) {
sectionLock.writeLock().lock();
sections = null;
levelChunk = null;
sectionLock.writeLock().unlock();
return super.trim(true);
} else if (sections == null) {
// don't bother trimming if there are no sections stored.
return true;
} else {
try {
synchronized (this) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
sections = null;
levelChunk = null;
return super.trim(true);
}
} finally {
sectionLock.writeLock().unlock();
}
}
synchronized (this) {
for (int i = getMinSectionPosition(); i <= getMaxSectionPosition(); i++) {
int layer = i - getMinSectionPosition();
if (!hasSection(i) || super.blocks[layer] == null) {
Expand Down
32 changes: 21 additions & 11 deletions ...main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1037,19 +1037,29 @@ public boolean hasNonEmptySection(int layer) {

@Override
@SuppressWarnings("unchecked")
public synchronized boolean trim(boolean aggressive) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
public boolean trim(boolean aggressive) {
synchronized (this) {
if (sections == null && (!aggressive || levelChunk == null)) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
return !aggressive || super.trim(true);
}
}
if (aggressive) {
sectionLock.writeLock().lock();
sections = null;
levelChunk = null;
sectionLock.writeLock().unlock();
return super.trim(true);
} else if (sections == null) {
// don't bother trimming if there are no sections stored.
return true;
} else {
try {
synchronized (this) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
sections = null;
levelChunk = null;
return super.trim(true);
}
} finally {
sectionLock.writeLock().unlock();
}
}
synchronized (this) {
for (int i = getMinSectionPosition(); i <= getMaxSectionPosition(); i++) {
int layer = i - getMinSectionPosition();
if (!hasSection(i) || super.blocks[layer] == null) {
Expand Down
32 changes: 21 additions & 11 deletions .../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_4/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,19 +996,29 @@ public boolean hasNonEmptySection(int layer) {

@Override
@SuppressWarnings("unchecked")
public synchronized boolean trim(boolean aggressive) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
public boolean trim(boolean aggressive) {
synchronized (this) {
if (sections == null && (!aggressive || levelChunk == null)) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
return !aggressive || super.trim(true);
}
}
if (aggressive) {
sectionLock.writeLock().lock();
sections = null;
levelChunk = null;
sectionLock.writeLock().unlock();
return super.trim(true);
} else if (sections == null) {
// don't bother trimming if there are no sections stored.
return true;
} else {
try {
synchronized (this) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
sections = null;
levelChunk = null;
return super.trim(true);
}
} finally {
sectionLock.writeLock().unlock();
}
}
synchronized (this) {
for (int i = getMinSectionPosition(); i <= getMaxSectionPosition(); i++) {
int layer = i - getMinSectionPosition();
if (!hasSection(i) || super.blocks[layer] == null) {
Expand Down
32 changes: 21 additions & 11 deletions .../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_5/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,19 +996,29 @@ public boolean hasNonEmptySection(int layer) {

@Override
@SuppressWarnings("unchecked")
public synchronized boolean trim(boolean aggressive) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
public boolean trim(boolean aggressive) {
synchronized (this) {
if (sections == null && (!aggressive || levelChunk == null)) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
return !aggressive || super.trim(true);
}
}
if (aggressive) {
sectionLock.writeLock().lock();
sections = null;
levelChunk = null;
sectionLock.writeLock().unlock();
return super.trim(true);
} else if (sections == null) {
// don't bother trimming if there are no sections stored.
return true;
} else {
try {
synchronized (this) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
sections = null;
levelChunk = null;
return super.trim(true);
}
} finally {
sectionLock.writeLock().unlock();
}
}
synchronized (this) {
for (int i = getMinSectionPosition(); i <= getMaxSectionPosition(); i++) {
int layer = i - getMinSectionPosition();
if (!hasSection(i) || super.blocks[layer] == null) {
Expand Down
32 changes: 21 additions & 11 deletions .../main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_6/PaperweightGetBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1004,19 +1004,29 @@ public boolean hasNonEmptySection(int layer) {

@Override
@SuppressWarnings("unchecked")
public synchronized boolean trim(boolean aggressive) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
public boolean trim(boolean aggressive) {
synchronized (this) {
if (sections == null && (!aggressive || levelChunk == null)) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
return !aggressive || super.trim(true);
}
}
if (aggressive) {
sectionLock.writeLock().lock();
sections = null;
levelChunk = null;
sectionLock.writeLock().unlock();
return super.trim(true);
} else if (sections == null) {
// don't bother trimming if there are no sections stored.
return true;
} else {
try {
synchronized (this) {
skyLight = new DataLayer[getSectionCount()];
blockLight = new DataLayer[getSectionCount()];
sections = null;
levelChunk = null;
return super.trim(true);
}
Comment thread
dordsor21 marked this conversation as resolved.
} finally {
sectionLock.writeLock().unlock();
}
}
synchronized (this) {
for (int i = getMinSectionPosition(); i <= getMaxSectionPosition(); i++) {
int layer = i - getMinSectionPosition();
if (!hasSection(i) || super.blocks[layer] == null) {
Expand Down
5 changes: 2 additions & 3 deletions ...core/src/main/java/com/fastasyncworldedit/core/queue/implementation/chunk/ChunkCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,8 @@ public synchronized boolean trim(boolean aggressive) {
if (!aggressive) {
return false;
}
synchronized (igb) {
igb.trim(true);
}
// Don't synchronise here, let the implementation handle it
igb.trim(true);
}
}
return result;
Expand Down
Loading