Skip to content

Guard Bukkit chunk unload path against reflection nulls and NPE loops #2

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
larroxtv merged 2 commits into from
May 10, 2026
Merged

Guard Bukkit chunk unload path against reflection nulls and NPE loops #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8e8d24
Initial plan
Copilot May 10, 2026
5c7a139
fix(bukkit): guard chunk unload reflection paths against nulls
Copilot May 10, 2026
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: 22 additions & 10 deletions Bukkit/src/main/java/com/plotsquared/bukkit/listener/ChunkListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,10 +174,19 @@ public boolean unloadChunk(String world, Chunk chunk, boolean safe) {
if (safe && shouldSave(world, chunk.getX(), chunk.getZ())) {
return false;
}
if (this.methodGetHandleChunk == null || this.mustNotSave == null || this.methodSetUnsaved == null) {
return false;
}
Object c = objChunkStatusFull != null
? this.methodGetHandleChunk.of(chunk).call(objChunkStatusFull)
: this.methodGetHandleChunk.of(chunk).call();
if (c == null) {
return false;
}
RefField.RefExecutor field = this.mustNotSave.of(c);
if (field == null) {
return false;
}
methodSetUnsaved.of(c).call(false);
if (!((Boolean) field.get())) {
field.set(true);
Expand Down Expand Up @@ -241,18 +250,21 @@ public void onChunkUnload(ChunkUnloadEvent event) {
if (ignoreUnload) {
return;
}
Chunk chunk = event.getChunk();
if (Settings.Chunk_Processor.AUTO_TRIM) {
String world = chunk.getWorld().getName();
if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(
world)) {
if (unloadChunk(world, chunk, true)) {
return;
try {
Chunk chunk = event.getChunk();
if (Settings.Chunk_Processor.AUTO_TRIM) {
String world = chunk.getWorld().getName();
if ((!Settings.Enabled_Components.WORLDS || !SinglePlotArea.isSinglePlotWorld(world)) && this.plotAreaManager.hasPlotArea(
world)) {
if (unloadChunk(world, chunk, true)) {
return;
}
}
}
}
if (processChunk(event.getChunk(), true)) {
chunk.setForceLoaded(true);
if (processChunk(chunk, true)) {
chunk.setForceLoaded(true);
}
} catch (NullPointerException ignored) {
}
}

Expand Down
Loading