From a8036abcb76f1464c7270245766ca29f929c2741 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 17 Nov 2026 10:57:21 -0700 Subject: [PATCH] Use volatile read in Folia scheduler task getStateVolatile VarHandle#get performs a plain read even when the underlying field is declared volatile. getStateVolatile in EntityScheduledTask and GlobalScheduledTask now uses getVolatile, matching its name and the existing setStateVolatile, which already uses setVolatile. --- .../paper/threadedregions/scheduler/FoliaEntityScheduler.java | 2 +- .../threadedregions/scheduler/FoliaGlobalRegionScheduler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/paper-server/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaEntityScheduler.java b/paper-server/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaEntityScheduler.java index 8dd612a8c632..45cf8599aa5d 100644 --- a/paper-server/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaEntityScheduler.java +++ b/paper-server/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaEntityScheduler.java @@ -135,7 +135,7 @@ private EntityScheduledTask(final Plugin plugin, final long repeatDelay, final C } private final int getStateVolatile() { - return (int)STATE_HANDLE.get(this); + return (int)STATE_HANDLE.getVolatile(this); } private final int compareAndExchangeStateVolatile(final int expect, final int update) { diff --git a/paper-server/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaGlobalRegionScheduler.java b/paper-server/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaGlobalRegionScheduler.java index 8e4d5dd086f0..922d82af5289 100644 --- a/paper-server/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaGlobalRegionScheduler.java +++ b/paper-server/src/main/java/io/papermc/paper/threadedregions/scheduler/FoliaGlobalRegionScheduler.java @@ -155,7 +155,7 @@ private GlobalScheduledTask(final Plugin plugin, final long repeatDelay, final C } private final int getStateVolatile() { - return (int)STATE_HANDLE.get(this); + return (int)STATE_HANDLE.getVolatile(this); } private final int compareAndExchangeStateVolatile(final int expect, final int update) {