Wake waiting voting NPCs after unloaded reservations

AGENTS.md

@@ -26,8 +26,6 @@ mvn -B -f VotingPlugin/pom.xml -Dtest=BackendControlConnectorProtocolTest,Contro
 CI runs `mvn -B -f VotingPlugin/pom.xml package`; see `.github/workflows/maven.yml`. Do not use the `dev` Maven profile in
 automation because it copies a JAR into a developer-specific server directory.
 
-All project tests and test-only helpers belong under `VotingPlugin/src/test/java/com/bencodez/votingplugin/tests/`, with package `com.bencodez.votingplugin.tests` or a meaningful subpackage. Keep paths and package declarations aligned, and update cross-test imports, resources, and build selectors when moving tests. Preserve package-phase artifact checks and test discovery. Do not widen production APIs to make tests accessible; use narrowly scoped test-only reflection for non-public seams. Platform API fixtures that must retain an external runtime class identity (such as `net.minecraft.network.chat.Component`) stay in that platform package and must not contain test cases.
-
 Assign one owner to Maven validation in each worktree. Never run concurrent Maven commands in the same worktree, including focused tests alongside a clean/package build: compilation and cleanup share `target/` and can invalidate each other. Reviewers must inspect source only while that owner builds, or run validation in a separate worktree.
 
 Keep the downloadable VotingPlugin JAR as small as practical. The 10 MiB size target is advisory:
@@ -60,10 +58,6 @@ For compatibility-sensitive changes, add regression coverage that exercises the
 - `com.bencodez.votingplugin.core` and its subpackages are platform-independent. Classes there must not import Bukkit, Paper, Fabric, Forge, or NeoForge APIs. Keep loader-specific adapters outside this package and enforce the boundary with `CorePlatformIsolationTest`.
 - `proxy/VotingPluginProxy` and the Bungee/Velocity platform packages own proxy lifecycle and vote routing.
 - `listeners/` receives Bukkit-side vote/player events; `proxy/cache/` owns proxy pending-vote queues.
-- `commands/CommandLoader` captures `VoteCommandEnabled`, `VoteCommandName` and `LoadCommandAliases` at startup.
-  Configuration reload must not change the registered player root or generated help/navigation. Preserve exact command
-  ownership, admin roots/aliases and canonical `VotingPlugin.Commands.Vote.*` permissions when disabling or renaming;
-  standalone player aliases retain their `vote...`/`v...` identities. See `docs/player-command-root.md`.
 - `votesites/` resolves configured service names. Be alert to the distinction between read-only resolution and paths that
   may auto-create a site.
 - `user/` owns player totals, points, streaks, last-vote values, and backend offline rewards.
@@ -330,7 +324,6 @@ Control behavior in production.
 
 - Trace whether the code runs on the connector worker, proxy thread, Bukkit primary thread, or a SQL executor.
 - Preserve queued votes across saturation, reload, runtime replacement, scheduler rejection/cancellation, shutdown, and restart; overflow handling must be bounded, durable when promised, and observable rather than silently dropping work. Scheduler admission is never proof of durable ownership.
-- Local Votifier captures remain owned after STARTED until normal callback completion or confirmed overflow transfer. Transfer execution stays fenced while the original callback runs; successful non-interrupted completion reconciles only its exact occurrence, while interruption/exception or failed transfer retains bounded recovery ownership. A callback completing after the final overflow snapshot is an explicit uncertain reconciliation case; a retired queue must not overwrite a successor, and ordinary partial external effects retain the existing at-least-once boundary.
 - Proxy-to-backend guaranteed delivery is capability negotiated and at least once. Journal a reward-bearing envelope before
   reporting transport acceptance, retain it until the matching backend completion acknowledgement is durable, persist
   completed IDs before acknowledgement for restart-safe deduplication, retire receipts only through the durable

README.md

@@ -52,5 +52,3 @@ or disabling it; inspections gate disabled state immediately and report a newly
 ```
 
 `LATEST` resolves to the latest stable release.
-
-Owner-defined [DateVoteMilestones](docs/date-vote-milestones.md) count qualifying accepted votes within explicit date windows, independently of normal totals. This optional feature is disabled until events are configured.

VotingPlugin/pom.xml

@@ -271,7 +271,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.6.1</version>
+                <version>3.5.4</version>
                 <executions>
                     <execution>
                         <id>default-test</id>
@@ -316,13 +316,6 @@
                 <enabled>false</enabled>
             </releases>
         </repository>
-        <repository>
-            <id>tcoded-releases</id>
-            <url>https://repo.tcoded.com/releases</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
         <repository>
             <id>velocity</id>
             <url>https://nexus.velocitypowered.com/repository/maven-public/</url>
@@ -389,7 +382,7 @@
         <dependency>
             <groupId>net.neoforged</groupId>
             <artifactId>mergetool</artifactId>
-            <version>2.0.7</version>
+            <version>2.0.0</version>
             <classifier>api</classifier>
             <scope>provided</scope>
         </dependency>
@@ -408,12 +401,12 @@
         <dependency>
             <groupId>org.yaml</groupId>
             <artifactId>snakeyaml</artifactId>
-            <version>2.7</version>
+            <version>2.6</version>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>26.3-R0.1-SNAPSHOT</version>
+            <version>26.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -431,7 +424,7 @@
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.15.0</version>
+            <version>2.14.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -482,7 +475,7 @@
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>
-            <version>8.0.2</version>
+            <version>7.5.3</version>
         </dependency>
         <dependency>
             <groupId>me.clip</groupId>
@@ -532,7 +525,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>6.1.3</version>
+            <version>5.12.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -544,13 +537,13 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>6.1.3</version>
+            <version>5.12.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>
-            <version>5.24.0</version>
+            <version>5.23.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>

VotingPlugin/src/main/java/com/bencodez/votingplugin/VotingPluginMain.java

@@ -71,9 +71,11 @@ import com.bencodez.votingplugin.broadcast.BroadcastSettings;
 import com.bencodez.votingplugin.proxy.BungeeMethod;
 import com.bencodez.votingplugin.commands.CommandLoader;
 import com.bencodez.votingplugin.commands.executers.CommandAdminVote;
+import com.bencodez.votingplugin.commands.executers.CommandVote;
 import com.bencodez.votingplugin.commands.gui.AdminGUI;
 import com.bencodez.votingplugin.commands.tabcompleter.AdminVoteTabCompleter;
 import com.bencodez.votingplugin.commands.tabcompleter.AliasCommandFilterListener;
+import com.bencodez.votingplugin.commands.tabcompleter.VoteTabCompleter;
 import com.bencodez.votingplugin.config.BungeeSettings;
 import com.bencodez.votingplugin.config.Config;
 import com.bencodez.votingplugin.config.ConfigVoteSites;
@@ -85,9 +87,6 @@ import com.bencodez.votingplugin.cooldown.CoolDownCheck;
 import com.bencodez.votingplugin.control.BackendControlAutoEnrollment;
 import com.bencodez.votingplugin.control.BackendControlConnector;
 import com.bencodez.votingplugin.data.ServerData;
-import com.bencodez.votingplugin.maintenance.AutoCreateVoteSitesReminderService;
-import com.bencodez.votingplugin.maintenance.AutoCreateVoteSitesReminderService.Settings;
-import com.bencodez.votingplugin.core.maintenance.AutoCreateVoteSitesReminderState;
 import com.bencodez.votingplugin.discord.DiscordHandler;
 import com.bencodez.votingplugin.listeners.BlockBreak;
 import com.bencodez.votingplugin.integration.votifier.VotifierIntegration;
@@ -157,6 +156,49 @@ import lombok.Setter;
 
 public class VotingPluginMain extends AdvancedCorePlugin {
 
+	private final Object votingNPCLifecycle = new Object();
+	private final java.util.concurrent.atomic.AtomicLong votingNPCConfiguration = new java.util.concurrent.atomic.AtomicLong();
+	private volatile com.bencodez.votingplugin.npc.VotingNPCManager votingNPCManager;
+
+	public com.bencodez.votingplugin.npc.VotingNPCManager getVotingNPCManager() { return votingNPCManager; }
+
+	/** Optional NPC storage is lazy and asynchronous; configuration only schedules owner work. */
+	private void refreshVotingNPCs() {
+		boolean requested = getConfigFile().isVotingNPCsEnabled();
+		long generation = votingNPCConfiguration.incrementAndGet();
+		if (!requested && votingNPCManager == null) return;
+		getBukkitScheduler().runTask(this, () -> {
+			com.bencodez.votingplugin.npc.VotingNPCManager manager;
+			synchronized (votingNPCLifecycle) {
+				if (!isEnabled() || generation != votingNPCConfiguration.get()) return;
+				if (votingNPCManager == null && requested) {
+					try {
+						var created = new com.bencodez.votingplugin.npc.VotingNPCManager(this);
+						Bukkit.getPluginManager().registerEvents(created, this);
+						votingNPCManager = created;
+					} catch (RuntimeException | LinkageError unsupported) {
+						getLogger().warning("Voting NPCs are unavailable on this server; normal voting is unaffected.");
+						return;
+					}
+				}
+				manager = votingNPCManager;
+			}
+			if (manager != null) manager.configure(requested);
+		});
+	}
+
+	private void closeVotingNPCs() {
+		com.bencodez.votingplugin.npc.VotingNPCManager manager;
+		synchronized (votingNPCLifecycle) {
+			votingNPCConfiguration.incrementAndGet();
+			manager = votingNPCManager;
+			votingNPCManager = null;
+		}
+		if (manager != null) {
+			try { manager.close(); } catch (RuntimeException | LinkageError failure) { debug(failure); }
+		}
+	}
+
 	@Getter
 	public static VotingPluginMain plugin;
 
@@ -175,9 +217,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private BroadcastHandler broadcastHandler;
 
-	@Getter
-	private com.bencodez.votingplugin.streaks.VoteStreaksMenu voteStreaksMenu;
-
 	@Getter
 	private BackendProxyHandler backendProxyHandler;
 	private ProcessedVoteCache backendProcessedVoteCache;
@@ -217,21 +256,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private CommandLoader commandLoader;
 
-	/** Runtime command identity is captured at startup; configuration reload does not rename it. */
-	public String getVoteCommandPrefix() {
-		return "/" + (commandLoader == null ? "vote" : commandLoader.getVoteCommandName());
-	}
-
-	public boolean isVoteCommandEnabled() {
-		return commandLoader == null || commandLoader.isVoteCommandEnabled();
-	}
-
-	/** Retarget the built-in invalid-command help hint, including existing Config.yml text. */
-	public String formatVoteCommandMessage(String message) {
-		return message.replace("%votecommand%", getVoteCommandPrefix())
-				.replaceAll("(?i)/vote(?=\\s|$|[!.,])", getVoteCommandPrefix());
-	}
-
 	@Getter
 	private NameMCLikeCheckerTask nameMCLikeCheckerTask;
 
@@ -287,7 +311,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	@Getter
 	private TopVoterState topVoterState;
-	private volatile com.bencodez.votingplugin.topvoter.TopVoterDisplayFilter topVoterDisplayFilter;
 
 
 	@Getter
@@ -316,8 +339,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	@Getter
 	private ScheduledExecutorService voteTimer;
-	private volatile AutoCreateVoteSitesReminderService autoCreateVoteSitesSetupReminder;
-	private ScheduledExecutorService autoCreateVoteSitesReminderWorker;
 
 	@Getter
 	private UserManager votingPluginUserManager;
@@ -339,9 +360,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	private volatile VotingPluginBackgroundTask backgroundTask;
 	private volatile AtomicBoolean basicBungeeUpdateRunning;
-	private final AtomicBoolean unloadInProgress = new AtomicBoolean();
-	private Set<String> completedUnloadSteps;
-	private java.util.concurrent.CompletionStage<Void> signShutdownPublication;
 
 	private synchronized AtomicBoolean basicBungeeUpdateAdmission() {
 		if (basicBungeeUpdateRunning == null) basicBungeeUpdateRunning = new AtomicBoolean();
@@ -351,13 +369,7 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	private VotingPluginConfigHealth configHealth;
 	private VotifierIntegration votifierIntegration;
 	@Getter
-	private volatile VotifierVoteOverflowQueue votifierVoteOverflowQueue;
-    private VotiferEvent localVotifierListener;
-    private boolean acceptedVoteIngressRegistered;
-    private boolean timeQueueIngressRegistered;
-    private volatile boolean localVotifierIngressReady;
-    private volatile boolean localVotifierIngressClosed;
-    private volatile long dateVoteIngressGeneration;
+	private VotifierVoteOverflowQueue votifierVoteOverflowQueue;
 	private VoteLogManager voteLogManager;
 	private VotingPluginWebhookManager webhookManager;
 
@@ -536,84 +548,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		return topVoterState.getLastMonthTopVoters();
 	}
 
-	/** Display-only snapshots; raw getters remain the award/accounting contract. */
-	public LinkedHashMap<TopVoterPlayer, Integer> getTopVoterDisplay(TopVoter top) {
-		return projectTopVoterDisplay(getTopVoter(top));
-	}
-
-	public java.util.concurrent.CompletionStage<LinkedHashMap<TopVoterPlayer, Integer>> getTopVoterDisplayAsync(TopVoter top) {
-		var filter = topVoterDisplayFilter;
-		var raw = new LinkedHashMap<>(getTopVoter(top));
-		return filter == null || !isEnabled() ? java.util.concurrent.CompletableFuture.completedFuture(raw)
-				: filter.projectAsync(raw, configFile != null && configFile.isHideTopVoterIfNotPlayedBefore());
-	}
-
-	private final java.util.concurrent.atomic.AtomicLong topVoterDisplayGeneration = new java.util.concurrent.atomic.AtomicLong();
-
-	public long getTopVoterDisplayGeneration() { return topVoterDisplayGeneration.get(); }
-
-	public LinkedHashMap<TopVoterPlayer, Integer> getLastMonthTopVoterDisplay() {
-		return projectTopVoterDisplay(getLastMonthTopVoter());
-	}
-
-	public LinkedHashMap<TopVoterPlayer, Integer> getPreviousMonthTopVoterDisplay(YearMonth month) {
-		return projectTopVoterDisplay(getPreviousMonthsTopVoters().getOrDefault(month, new LinkedHashMap<>()));
-	}
-
-	private LinkedHashMap<TopVoterPlayer, Integer> projectTopVoterDisplay(LinkedHashMap<TopVoterPlayer, Integer> raw) {
-		var filter = topVoterDisplayFilter;
-		return filter == null || !isEnabled() ? new LinkedHashMap<>(raw)
-				: filter.project(raw, configFile != null && configFile.isHideTopVoterIfNotPlayedBefore());
-	}
-
-	public void initializeTopVoterDisplayFilter() {
-		retireTopVoterDisplayFilter();
-		boolean onlineMode = getOptions().isOnlineMode();
-		var filter = new com.bencodez.votingplugin.topvoter.TopVoterDisplayFilter(row ->
-				com.bencodez.votingplugin.topvoter.TopVoterPresenceIdentity
-						.identities(row, onlineMode, UuidLookup.getInstance()::getCachedUUID),
-				(row, aliases) -> checkTopVoterPresence(aliases, onlineMode), System::nanoTime,
-				this::topVoterDisplayRankingRows);
-		registerEvents(filter);
-		topVoterDisplayFilter = filter;
-	}
-
-	/** Cache capacity follows already loaded rankings, including disjoint historical identities. */
-	private long topVoterDisplayRankingRows() {
-		var state = topVoterState;
-		if (state == null) return 0L;
-		long rows = state.getLastMonthTopVoters().size();
-		for (var board : state.getTopVoters().values()) if (board != null) rows += board.size();
-		for (var board : state.getPreviousMonthsTopVoters().values()) if (board != null) rows += board.size();
-		return rows;
-	}
-
-	private java.util.concurrent.CompletionStage<com.bencodez.advancedcore.api.user.presence.PlayerPresence>
-			checkTopVoterPresence(java.util.List<java.util.UUID> aliases, boolean onlineMode) {
-		boolean completeOnlineHistory = onlineMode || aliases.stream().anyMatch(alias ->
-				alias != null && alias.version() == 4 && alias.variant() == 2);
-		if (!completeOnlineHistory) return checkPlayerPresenceIdentitiesAsync(aliases);
-		try {
-			return checkPlayerPresenceIdentitiesAsync(aliases, true);
-		} catch (NoSuchMethodError | AbstractMethodError unsupported) {
-			// Older SDKs can retain a positive but cannot certify the wider absence scope.
-			return checkPlayerPresenceIdentitiesAsync(aliases).thenApply(evidence ->
-					evidence == com.bencodez.advancedcore.api.user.presence.PlayerPresence.NEVER_JOINED
-							? com.bencodez.advancedcore.api.user.presence.PlayerPresence.UNKNOWN : evidence);
-		}
-	}
-
-	private void retireTopVoterDisplayFilter() {
-		topVoterDisplayGeneration.incrementAndGet();
-		if (discordHandler != null) discordHandler.retireLeaderboardPublications();
-		var filter = topVoterDisplayFilter;
-		topVoterDisplayFilter = null;
-		if (filter != null) {
-			filter.close();
-			org.bukkit.event.HandlerList.unregisterAll(filter);
-		}
-	}
-
 	public LinkedHashMap<YearMonth, LinkedHashMap<TopVoterPlayer, Integer>> getPreviousMonthsTopVoters() {
 		return topVoterState.getPreviousMonthsTopVoters();
 	}
@@ -717,11 +651,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	@Getter
 	private VoteStreakHandler voteStreakHandler;
 
-    @Getter
-    private final com.bencodez.votingplugin.specialrewards.datemilestones.DateVoteMilestones dateVoteMilestones =
-            new com.bencodez.votingplugin.specialrewards.datemilestones.DateVoteMilestones(this);
-
-
 	/**
 	 * Registers a directly editable rewards path from SpecialRewards.yml.
 	 *
@@ -735,7 +664,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		VoteSiteRewardRegistrar.register(this);
 		VotePartyRewardRegistrar.register(this);
 		VoteMilestoneRewardRegistrar.register(this);
-        dateVoteMilestones.reload();
 		VoteStreakRewardRegistrar.register(this);
 		TopVoterRewardRegistrar.register(this);
 		VoteShopRewardRegistrar.register(this);
@@ -807,37 +735,8 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		new VotingPluginMetrics().load(plugin);
 	}
 
-    /** Publish accepted and transport ingress only after the complete vote pipeline is initialized. */
-    void initializeDateVoteIngress(Runnable openProxy) {
-        if (localVotifierIngressClosed) throw new IllegalStateException("Vote ingress is shutting down");
-        if (localVotifierIngressReady) return;
-        if (voteMilestonesManager == null || voteStreakHandler == null || voteParty == null || specialRewards == null
-                || topVoterHandler == null || voteShopManager == null || placeholders == null) {
-            throw new IllegalStateException("Accepted-vote handlers must initialize before transport ingress");
-        }
-        getDateVoteMilestones().reload();
-        if (!acceptedVoteIngressRegistered) {
-            getServer().getPluginManager().registerEvents(new PlayerVoteListener(this), this);
-            acceptedVoteIngressRegistered = true;
-        }
-        // Construction itself schedules persisted replay. Open it only after its consumer.
-        if (!timeQueueIngressRegistered && (!getBungeeSettings().isUseBungeecoord() || !getBungeeSettings().isGloblalDataEnabled())) {
-            timeQueueHandler = new TimeQueueHandler(this);
-            getServer().getPluginManager().registerEvents(timeQueueHandler, this);
-            timeQueueIngressRegistered = true;
-        }
-        if (getBungeeSettings().isUseBungeecoord()) openProxy.run();
-        localVotifierIngressReady = true;
-        VotifierVoteOverflowQueue overflow = votifierVoteOverflowQueue;
-        if (overflow != null) overflow.start();
-    }
-
 	@Override
 	public void onPostLoad() {
-        loadVoteTimer();
-        checkVotifier();
-        registerEarlyVotifierIngress();
-		serverData.refreshVotePartyDisplay();
 		ensureCommunicationSecret();
 		// auto conversion for Shop.yml
 		if (plugin.getShopFile().isJustCreated()) {
@@ -865,20 +764,16 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		voteTester = new VoteTester(plugin);
 
-		BoundedScheduledExecutor setupReminderWorker = new BoundedScheduledExecutor(1, 4);
-		setupReminderWorker.setThreadFactory(runnable -> {
-			Thread worker = new Thread(runnable, "VotingPlugin-SiteSetupReminder");
-			worker.setDaemon(true);
-			return worker;
-		});
-		autoCreateVoteSitesReminderWorker = setupReminderWorker;
-		autoCreateVoteSitesSetupReminder = new AutoCreateVoteSitesReminderService(getDataFolder().toPath(),
-				setupReminderWorker, getLogger(), autoCreateVoteSitesReminderSettings());
-		autoCreateVoteSitesSetupReminder.start();
+		loadVoteTimer();
 		getVotingPluginUserManager().startSharedPointTransferRecovery();
 
-		// Proxy ingress opens below, after every accepted-vote handler is initialized.
+		if (bungeeSettings.isUseBungeecoord()) {
+			loadBungeeHandler();
+		}
 
+		if (!bungeeSettings.isUseBungeecoord() || !bungeeSettings.isGloblalDataEnabled()) {
+			this.timeQueueHandler = new TimeQueueHandler(this);
+		}
 
 		if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
 			if (getConfigFile().isLoadInteralExpansion()) {
@@ -893,8 +788,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		voteStreakHandler.reload();
 
 		registerCommands();
+		checkVotifier();
 		registerEvents();
 		refreshPlaceholderPlayerPresence();
+		refreshVotingNPCs();
 
 		loadVoteBroadcast();
 
@@ -918,7 +815,6 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		});
 
 		topVoterState = new TopVoterState();
-		initializeTopVoterDisplayFilter();
 		topVoterHandler = new TopVoterHandler(this);
 
 		new AdminGUI(this).loadHook();
@@ -983,7 +879,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		}
 
 		VotingPluginRewardRegistrar.register(this);
-        initializeDateVoteIngress(this::loadBungeeHandler);
+		// Recovered Votifier votes may now traverse the fully initialized vote,
+		// reward, placeholder, shop, and vote-party pipeline.
+		if (votifierVoteOverflowQueue != null) {
+			votifierVoteOverflowQueue.start();
+		}
 
 		plugin.getLogger().info("Enabled VotingPlugin " + plugin.getDescription().getVersion());
 		if (plugin.getDescription().getVersion().contains("SNAPSHOT")) {
@@ -2044,112 +1944,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		configFile.saveData();
 	}
 
-	@Getter
-	private volatile com.bencodez.votingplugin.util.ServerDataPublicationFence serverDataPublicationFence;
-
-	private volatile com.bencodez.votingplugin.data.GenerationFencedServerDataFile fencedServerDataFile;
-
-	private java.util.concurrent.CompletableFuture<Void> serverDataFinalPublication;
-	private boolean serverDataFinalPublicationReserved;
-	private boolean serverDataFinalStageAttached;
-	private volatile boolean serverDataEnableCleanupStarted;
-	private volatile boolean serverDataEnableAdmissionRejected;
-
-	@Override
-	public com.bencodez.advancedcore.data.ServerData getServerDataFile() {
-		var file = super.getServerDataFile();
-		var current = fencedServerDataFile;
-		if (current != null && current.wraps(file)) {
-			// The SDK replaces its file after pre-load. A failed new generation has
-			// no file to finalize; never expose the predecessor as its current owner.
-			return current.belongsTo(serverDataPublicationFence) ? current : null;
-		}
-		synchronized (this) {
-			file = super.getServerDataFile();
-			var owner = serverDataPublicationFence;
-			if (file == null || owner == null) return file;
-			current = fencedServerDataFile;
-			if (current != null && current.wraps(file) && !current.belongsTo(owner)) return null;
-			if (current == null || !current.wraps(file)) {
-				current = new com.bencodez.votingplugin.data.GenerationFencedServerDataFile(this, file, owner);
-				fencedServerDataFile = current;
-			}
-			return current;
-		}
-	}
-
-	/** Capture the existing AdvancedCore executors which can still publish server-data state. */
-	public ScheduledExecutorService[] getServerDataWriterExecutors() {
-		var checker = getTimeChecker();
-		return new ScheduledExecutorService[] { getTimer(), getLoginTimer(), getInventoryTimer(),
-				checker == null ? null : checker.getTimer() };
-	}
-
-	@Override
-	public void onEnable() {
-		synchronized (this) {
-			// Bind a retained SDK file before changing owner. AdvancedCore replaces its
-			// private file only later in loadHook(), after onPreLoad().
-			if (serverDataPublicationFence != null) getServerDataFile();
-			serverDataPublicationFence = com.bencodez.votingplugin.util.ServerDataPublicationFence.beginGeneration(
-					getDataFolder().toPath().resolve("ServerData.yml"));
-            try { serverDataPublicationFence.retainForProcessExit(); }
-            catch (RuntimeException | Error registrationFailure) {
-                serverDataEnableAdmissionRejected = true;
-                try { serverDataPublicationFence.retire(); }
-                catch (RuntimeException | Error cleanupFailure) {
-                    if (cleanupFailure != registrationFailure) registrationFailure.addSuppressed(cleanupFailure);
-                }
-                throw registrationFailure;
-            }
-			serverDataFinalPublication = new java.util.concurrent.CompletableFuture<>();
-			serverDataFinalPublicationReserved = false;
-			serverDataFinalStageAttached = false;
-			serverDataEnableCleanupStarted = false;
-			serverDataEnableAdmissionRejected = false;
-		}
-		// Failed startup can already own SDK writers; disable must retire them before replacement.
-		try { super.onEnable(); }
-		catch (RuntimeException | Error failure) {
-			// SDK admission can fail before its startup-cleanup try/catch. Such an
-			// attempt admitted no new writers and must not strand an empty plugin owner.
-			// An admitted startup failure already entered our onDisable; preserve its drain.
-			if (!serverDataEnableCleanupStarted) {
-				serverDataEnableAdmissionRejected = true;
-				try {
-					serverDataPublicationFence.retire();
-					serverDataFinalPublication.complete(null);
-				} catch (RuntimeException | Error cleanupFailure) {
-					if (cleanupFailure != failure) failure.addSuppressed(cleanupFailure);
-				}
-			}
-			throw failure;
-		}
-	}
-
-    /** Start a fresh ingress generation only after the prior consumers retired. */
-    private void resetDateVoteIngressForEnable() {
-        if ((localVotifierListener != null || acceptedVoteIngressRegistered || timeQueueIngressRegistered)
-                && (completedUnloadSteps == null || !completedUnloadSteps.contains("event handlers")
-                    || localVotifierListener != null && !completedUnloadSteps.contains("local Votifier ingress"))) {
-            throw new IllegalStateException("Previous vote ingress did not retire");
-        }
-        dateVoteIngressGeneration++;
-        localVotifierIngressReady = false;
-        localVotifierIngressClosed = false;
-        acceptedVoteIngressRegistered = false;
-        timeQueueIngressRegistered = false;
-        localVotifierListener = null;
-        timeQueueHandler = null;
-    }
-
 	@Override
 	public void onPreLoad() {
-        resetDateVoteIngressForEnable();
 		plugin = this;
-		unloadInProgress.set(false);
-		completedUnloadSteps = new java.util.HashSet<>();
-		signShutdownPublication = null;
 
 		setupFiles();
 		if ("SQLITE".equalsIgnoreCase(configFile.getData().getString("DataStorage", "SQLITE"))) {
@@ -2191,83 +1988,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	@Override
 	public void onDisable() {
-		// The rejected enable owns no SDK shutdown stage to complete a new reservation.
-		if (serverDataEnableAdmissionRejected) return;
-		runShutdownStep("server-data process drain", this::beginServerDataProcessDrain);
-		serverDataEnableCleanupStarted = true;
-		runShutdownStep("Discord leaderboards", () -> {
-			if (discordHandler != null) discordHandler.close();
-		});
-		runShutdownStep("setup reminder", this::stopAutoCreateVoteSitesSetupReminder);
-		runShutdownStep("server-data writer retirement", () -> {
-			if (serverDataPublicationFence != null) {
-				retainServerDataFinalPublication();
-				var coreWriters = getServerDataWriterExecutors();
-				var writers = java.util.Arrays.copyOf(coreWriters, coreWriters.length + 1);
-				writers[coreWriters.length] = voteTimer;
-				serverDataPublicationFence.retainUntilTermination(writers);
-			}
-		});
+		if (offlineVoteOwnerHandoffs != null) offlineVoteOwnerHandoffs.close();
 		try {
-			runShutdownStep("offline vote handoffs", () -> {
-				if (offlineVoteOwnerHandoffs != null) offlineVoteOwnerHandoffs.close();
-			});
+			shutdownVoteReminders();
 		} finally {
-			try { shutdownVoteReminders(); }
-			finally {
-				try { super.onDisable(); }
-				finally { runShutdownStep("server-data publication owner", () -> {
-					if (serverDataPublicationFence != null) serverDataPublicationFence.retire();
-				}); }
-			}
-		}
-	}
-
-	/** Reserve before SDK shutdown can enqueue a final file publication. No YAML lock or wait. */
-	private void retainServerDataFinalPublication() {
-		synchronized (this) {
-			if (serverDataFinalPublicationReserved) return;
-			if (serverDataFinalPublication == null)
-				serverDataFinalPublication = new java.util.concurrent.CompletableFuture<>();
-			serverDataPublicationFence.retainUntilSuccessfulPublication(serverDataFinalPublication);
-			serverDataFinalPublicationReserved = true;
-		}
-	}
-
-	@Override
-	public void onShutdownComplete(java.util.concurrent.CompletionStage<Void> finalFilesStage) {
-		java.util.concurrent.CompletableFuture<Void> publication;
-		synchronized (this) {
-			publication = serverDataFinalStageAttached ? null : serverDataFinalPublication;
-			serverDataFinalStageAttached = true;
-		}
-		try {
-			if (publication != null) {
-				try {
-					java.util.Objects.requireNonNull(finalFilesStage).whenComplete((ignored, failure) -> {
-						if (failure == null) publication.complete(null);
-						else publication.completeExceptionally(failure);
-					});
-				} catch (Throwable failure) { publication.completeExceptionally(failure); }
-			}
-		} finally { super.onShutdownComplete(finalFilesStage); }
-	}
-
-	private Settings autoCreateVoteSitesReminderSettings() {
-		return new Settings(true, configFile.isAutoCreateVoteSites(),
-				AutoCreateVoteSitesReminderState.DEFAULT_THRESHOLD_MILLIS,
-				AutoCreateVoteSitesReminderState.DEFAULT_REPEAT_MILLIS);
-	}
-
-	private void stopAutoCreateVoteSitesSetupReminder() {
-		AutoCreateVoteSitesReminderService current = autoCreateVoteSitesSetupReminder;
-		autoCreateVoteSitesSetupReminder = null;
-		ScheduledExecutorService worker = autoCreateVoteSitesReminderWorker;
-		autoCreateVoteSitesReminderWorker = null;
-		try {
-			if (current != null) current.closeAsync();
-		} finally {
-			if (worker != null) worker.shutdown();
+			super.onDisable();
 		}
 	}
 
@@ -2280,112 +2005,49 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 	@Override
 	public void onUnLoad() {
-		runShutdownStep("server-data process drain", this::beginServerDataProcessDrain);
-		if (!unloadInProgress.compareAndSet(false, true)) {
-			runShutdownStep("time queue retry", () -> {
-				if (timeQueueHandler != null) timeQueueHandler.saveForShutdown();
-			});
-			return;
-		}
-		try {
-			if (completedUnloadSteps == null) completedUnloadSteps = new java.util.HashSet<>();
-			runUnloadStep("Discord leaderboards", () -> {
-				if (discordHandler != null) discordHandler.close();
-			});
-			runUnloadStep("top voter display", this::retireTopVoterDisplayFilter);
-			runUnloadStep("streak menu", () -> {
-				if (voteStreaksMenu != null) voteStreaksMenu.close();
-			});
-			runUnloadStep("setup reminder", this::stopAutoCreateVoteSitesSetupReminder);
-			runUnloadStep("player presence", placeholderPlayerPresence::clear);
-			runUnloadStep("backend hosted Control", this::stopBackendHostedControlLifecycle);
-			runUnloadStep("backend Control connector", this::stopBackendControlConnectorLifecycle);
-			runUnloadStep("backend proxy", () -> {
-				if (getBackendProxyHandler() != null) getBackendProxyHandler().closeForShutdown();
-			});
-			runUnloadStep("backend ordered vote queue", () -> {
-				if (backendOrderedVoteOverflowQueue != null) {
-					backendOrderedVoteOverflowQueue.close();
-					backendOrderedVoteOverflowQueue = null;
-				}
-			});
-			runUnloadStep("webhook manager", () -> {
-				if (webhookManager != null) webhookManager.shutdown();
-			});
-			runUnloadStep("local Votifier ingress", () -> {
-				localVotifierIngressClosed = true;
-				localVotifierIngressReady = false;
-				if (localVotifierListener != null) localVotifierListener.stop();
-			});
-			runUnloadStep("vote timer", this::shutdownVoteTimer);
-			runUnloadStep("Votifier vote queue", () -> {
-				if (votifierVoteOverflowQueue != null) {
-					votifierVoteOverflowQueue.close();
-					votifierVoteOverflowQueue = null;
-				}
-			});
-			runShutdownStep("time queue", () -> {
-				if (timeQueueHandler != null) timeQueueHandler.saveForShutdown();
-			});
-			runUnloadStep("vote reminders", this::shutdownVoteReminders);
-			runUnloadStep("cooldown checker", () -> {
-				if (coolDownCheck != null) {
-					coolDownCheck.shutdown();
-					coolDownCheck = null;
-				}
-			});
-			runShutdownStep("signs", this::shutdownSigns);
-			runUnloadStep("event handlers", () -> HandlerList.unregisterAll(this));
-			// Late producers must see rejection until their overflow and handler cleanup finishes.
-			if (completedUnloadSteps.contains("vote timer")) voteTimer = null;
-			if (plugin == this) plugin = null;
-		} finally { unloadInProgress.set(false); }
-	}
-
-    private void beginServerDataProcessDrain() {
-        var owner = serverDataPublicationFence;
-        if (owner != null) owner.beginShutdown(System.nanoTime());
-    }
-
-    private void shutdownSigns() {
-        if (signs == null) return;
-        var previous = signShutdownPublication;
-        if (previous != null && !previous.toCompletableFuture().isCompletedExceptionally()) return;
-        signShutdownPublication = java.util.Objects.requireNonNull(signs.storeSignsForShutdown());
-    }
-
-	private void runUnloadStep(String name, Runnable step) {
-		if (!completedUnloadSteps.contains(name) && runShutdownStep(name, step)) completedUnloadSteps.add(name);
-	}
-
-	private boolean runShutdownStep(String name, Runnable step) {
-		try {
-			step.run();
-			return true;
-		} catch (RuntimeException | Error failure) {
+		closeVotingNPCs();
+		placeholderPlayerPresence.clear();
+		stopBackendHostedControlLifecycle();
+		stopBackendControlConnectorLifecycle();
+		if (getBackendProxyHandler() != null) {
 			try {
-				getLogger().log(java.util.logging.Level.WARNING, "Failed to shut down " + name, failure);
-			} catch (RuntimeException | Error ignored) {
-				// Logging must not prevent the next independent cleanup step.
+				getBackendProxyHandler().closeForShutdown();
+			} catch (Exception e) {
+				debug(e);
 			}
-			return false;
 		}
-	}
-
-	private void shutdownVoteTimer() {
-		if (voteTimer == null) return;
+		if (backendOrderedVoteOverflowQueue != null) {
+			backendOrderedVoteOverflowQueue.close();
+			backendOrderedVoteOverflowQueue = null;
+		}
+		if (webhookManager != null) {
+			webhookManager.shutdown();
+		}
+		voteTimer.shutdown();
 		try {
-			voteTimer.shutdown();
-			if (!voteTimer.awaitTermination(1, TimeUnit.SECONDS)) voteTimer.shutdownNow();
-		} catch (InterruptedException interrupted) {
-			Thread.currentThread().interrupt();
-			voteTimer.shutdownNow();
-		} catch (RuntimeException failure) {
-			try {
-				getLogger().log(java.util.logging.Level.WARNING, "Failed to shut down vote timer", failure);
-			} catch (RuntimeException | Error ignored) { }
-			voteTimer.shutdownNow();
+			voteTimer.awaitTermination(1, TimeUnit.SECONDS);
+		} catch (InterruptedException e) {
+			e.printStackTrace();
 		}
+		voteTimer.shutdownNow();
+		if (votifierVoteOverflowQueue != null) {
+			votifierVoteOverflowQueue.close();
+			votifierVoteOverflowQueue = null;
+		}
+		if (timeQueueHandler != null) {
+			timeQueueHandler.save();
+		}
+
+		shutdownVoteReminders();
+
+		if (coolDownCheck != null) {
+			coolDownCheck.shutdown();
+			coolDownCheck = null;
+		}
+
+		getSigns().storeSigns();
+		HandlerList.unregisterAll(plugin);
+		plugin = null;
 	}
 
 	/**
@@ -2396,6 +2058,12 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		commandLoader.loadCommands();
 		commandLoader.loadAliases();
 
+		// /vote, /v
+		getCommand("vote").setExecutor(new CommandVote(this));
+		getCommand("vote").setTabCompleter(new VoteTabCompleter());
+		// getCommand("v").setExecutor(new CommandVote(this));
+		// getCommand("v").setTabCompleter(new VoteTabCompleter());
+
 		// /adminvote, /av
 		getCommand("adminvote").setExecutor(new CommandAdminVote(this));
 		getCommand("adminvote").setTabCompleter(new AdminVoteTabCompleter());
@@ -2414,44 +2082,23 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			}
 		}
 
-        // Export documentation only after both handler lists and the player command label are ready.
-        // A filesystem problem must never stop registration or normal voting.
-        try {
-            if (com.bencodez.votingplugin.commands.CommandDocumentationExporter.write(getDataFolder().toPath(),
-                    getVoteCommandPrefix(), getVoteCommand(), getAdminVoteCommand())) {
-                getLogger().info("Updated generated command documentation in GeneratedDocs/");
-            }
-        } catch (IOException | RuntimeException error) {
-            getLogger().warning("Unable to write generated command documentation: " + error.getMessage());
-        }
-
 		plugin.debug("Loaded Commands");
 
 	}
 
-    /** Capture external events early; only the existing bounded workers may buffer/process them. */
-    void registerEarlyVotifierIngress() {
-        if (localVotifierIngressClosed || !isVotifierLoaded() || localVotifierListener != null) return;
-        long generation = dateVoteIngressGeneration;
-        java.util.function.BooleanSupplier ready = () -> dateVoteIngressGeneration == generation
-                && localVotifierIngressReady && !localVotifierIngressClosed;
-        VotiferEvent listener = new VotiferEvent(this, ready);
-        // Publish the memory owner before capture. Its independent worker loads
-        // disk state; vote-executor cancellation cannot discard queue setup.
-        votifierVoteOverflowQueue = VotifierVoteOverflowQueue.initializeConfirmedAsync(this,
-                listener::processVoteConfirmed, ready);
-        localVotifierListener = listener;
-        if (localVotifierIngressReady) votifierVoteOverflowQueue.start();
-        getServer().getPluginManager().registerEvents(listener, this);
-    }
-
+	/**
+	 * Register events.
+	 */
 	private void registerEvents() {
-		voteStreaksMenu = new com.bencodez.votingplugin.streaks.VoteStreaksMenu(this);
-		getServer().getPluginManager().registerEvents(voteStreaksMenu, this);
 		PluginManager pm = getServer().getPluginManager();
 
 		pm.registerEvents(new PlayerJoinEvent(this), this);
-        pm.registerEvents(new com.bencodez.votingplugin.listeners.DateVoteMenuOpenGuard(), this);
+		if (isVotifierLoaded()) {
+			VotiferEvent votifierEvent = new VotiferEvent(this);
+			votifierVoteOverflowQueue = new VotifierVoteOverflowQueue(this, votifierEvent::processVote);
+			pm.registerEvents(votifierEvent, this);
+		}
+		pm.registerEvents(new PlayerVoteListener(this), this);
 		pm.registerEvents(new PlayerPostVoteLoggerListener(this), this);
 		pm.registerEvents(new PlayerSpecialRewardLoggerListener(this), this);
 		pm.registerEvents(new VoteShopPurchaseLoggerListener(this), this);
@@ -2465,6 +2112,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 			pm.registerEvents(new PlayerInteract(this), this);
 		}
 
+		if (timeQueueHandler != null) {
+			pm.registerEvents(timeQueueHandler, plugin);
+		}
 
 		pm.registerEvents(new VotingPluginUpdateEvent(this), this);
 		/*
@@ -2495,19 +2145,15 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	/** Captures Bukkit presence while the lifecycle caller owns platform access. */
 	public void refreshPlaceholderPlayerPresence() {
 		boolean onlineMode = getOptions().isOnlineMode();
-		placeholderPlayerPresence.refresh(Bukkit::getOnlinePlayers, (player, capture) ->
-				com.bencodez.votingplugin.util.BukkitCompletionScheduler.run(this, player, () -> {
-					if (!player.isOnline()) return;
-					UUID storageUuid = placeholderPlayerPresence.storageUuid(player);
-					capture.accept(storageUuid == null ? placeholderStorageUuid(player, onlineMode) : storageUuid);
-				}, () -> { }, () -> { }));
+		placeholderPlayerPresence.replace(Bukkit::getOnlinePlayers,
+				player -> placeholderStorageUuid(player, onlineMode));
 	}
 
 	static UUID placeholderStorageUuid(Player player, boolean onlineMode) {
 		if (onlineMode) return player.getUniqueId();
-		String resolvedUuid = UuidLookup.getInstance().getUUIDWithoutStorage(player.getName());
+		String cachedUuid = UuidLookup.getInstance().getCachedUUID(player.getName());
 		try {
-			return UUID.fromString(resolvedUuid);
+			return UUID.fromString(cachedUuid);
 		} catch (IllegalArgumentException | NullPointerException ignored) {
 			return player.getUniqueId();
 		}
@@ -2523,13 +2169,9 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 	private void reloadPlugin(boolean userStorage, boolean reconcileHostedControl,
 			boolean updateActiveBackendRuntime) {
 		if (offlineVoteOwnerHandoffs != null) offlineVoteOwnerHandoffs.pause();
-		retireTopVoterDisplayFilter();
 		try {
-		if (voteStreaksMenu != null) voteStreaksMenu.suspend();
 		configFile.reloadData();
 		configFile.loadValues();
-		AutoCreateVoteSitesReminderService setupReminder = autoCreateVoteSitesSetupReminder;
-		if (setupReminder != null) setupReminder.reload(autoCreateVoteSitesReminderSettings());
 
 		configVoteSites.reloadData();
 
@@ -2544,13 +2186,10 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 		updateAdvancedCoreHook();
 
 		reloadAdvancedCore(userStorage);
-		initializeTopVoterDisplayFilter();
 		// PerServerPoints can switch shared point storage on during a live reload.
 		// Re-evaluate after storage has reloaded; UserManager keeps this lifecycle task unique.
 		getVotingPluginUserManager().startSharedPointTransferRecovery();
 
-        getOptions().setServer(bungeeSettings.getServer());
-        getDateVoteMilestones().reload();
 		reloadBackendProxyRuntime(updateActiveBackendRuntime, userStorage);
 		checkYMLError();
 
@@ -2578,11 +2217,11 @@ public class VotingPluginMain extends AdvancedCorePlugin {
 
 		loadDirectlyDefined();
 
+		refreshVotingNPCs();
 		if (reconcileHostedControl) restartBackendControlConnector();
 
 		setUpdate(true);
 		} finally {
-			if (voteStreaksMenu != null) voteStreaksMenu.resume();
 			if (offlineVoteOwnerHandoffs != null) offlineVoteOwnerHandoffs.resume();
 		}
 	}

VotingPlugin/src/main/java/com/bencodez/votingplugin/backendproxy/messaging/BackendProxyMessageRouter.java

@@ -569,8 +569,7 @@ public class BackendProxyMessageRouter {
 		}
 
 		String totalsRaw = nvl(fields.get(VotingPluginWire.K_TOTALS));
-		VoteTotalsSnapshot totals = !com.bencodez.votingplugin.proxy.VoteOccurrenceMetadata.hasPayload(totalsRaw)
-                ? null : VoteTotalsSnapshot.parseStorage(totalsRaw);
+		VoteTotalsSnapshot totals = totalsRaw.isEmpty() ? null : VoteTotalsSnapshot.parseStorage(totalsRaw);
 		VoteSite voteSite = plugin.getVoteSiteManager()
 				.getVoteSite(plugin.getVoteSiteManager().getVoteSiteName(true, service), true);
 		if (voteSite == null) {
@@ -716,29 +715,16 @@ public class BackendProxyMessageRouter {
 		user.cache();
 		boolean wasOnline = vote.wasOnlineKnown ? vote.wasOnline : user.isOnline();
 		boolean queuedDelivery = vote.queuedDeliveryKnown ? vote.queuedDelivery : vote.delayValidated;
-		com.bencodez.votingplugin.events.PlayerVoteEvent dispatchedEvent = null;
-		VotingPluginUser.DateMilestoneAccountingException dateAccountingFailure = null;
-		try {
-			// Keep totals correlation for replay fencing, but only the original wire ID
-			// identifies a canonical transport occurrence in the native event.
-			dispatchedEvent = user.bungeeVotePluginMessagingEvent(vote.service, vote.time, totals, !vote.manageTotals,
-					wasOnline, vote.broadcast, vote.num, queuedDelivery, vote.delayValidationKnown,
-					vote.queuedDeliveryKnown, vote.voteId,
-					VotingPluginWire.SUB_VOTE_ONLINE.equals(msg.getSubChannel()), vote.realVote,
-					vote.canonicalOccurrenceTime);
-		} catch (VotingPluginUser.DateMilestoneAccountingException incomplete) {
-			dateAccountingFailure = incomplete;
-		}
-		if ((dispatchedEvent == null || !dispatchedEvent.isCancelled())
-				&& plugin.getBungeeSettings().isPerServerPoints()) {
+		var event = user.bungeeVotePluginMessagingEvent(vote.service, vote.time, totals, !vote.manageTotals,
+				wasOnline, vote.broadcast, vote.num, queuedDelivery, vote.delayValidationKnown,
+				vote.queuedDeliveryKnown, voteId,
+				VotingPluginWire.SUB_VOTE_ONLINE.equals(msg.getSubChannel()));
+		if ((event == null || !event.isCancelled()) && plugin.getBungeeSettings().isPerServerPoints()) {
 			user.addPoints(plugin.getConfigFile().getPointsOnVote());
 		}
 		if (vote.service != null && !vote.service.isEmpty()) {
 			plugin.getServerData().addServiceSite(vote.service);
 		}
-		// Date accounting cannot suppress normal points/service observations. Keep
-		// the reservation incomplete so reconciliation cannot replay normal rewards.
-		if (dateAccountingFailure != null) throw dateAccountingFailure;
 		return new WireVoteResult(voteId, true, false);
 	}
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/CommandDocumentationExporter.java

@@ -1,207 +0,0 @@
-package com.bencodez.votingplugin.commands;
-
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.AtomicMoveNotSupportedException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.advancedcore.api.command.PlayerCommandHandler;
-import com.google.gson.GsonBuilder;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-
-/**
- * Exports the actual Bukkit command-handler registrations as a deterministic
- * machine-readable manifest and an administrator-friendly Markdown reference.
- * It never executes a command or accesses user data.
- */
-public final class CommandDocumentationExporter {
-    public static final String DIRECTORY = "GeneratedDocs";
-    public static final String JSON_NAME = "commands.json";
-    public static final String MARKDOWN_NAME = "commands.md";
-
-    private CommandDocumentationExporter() {
-    }
-
-    public static final class CommandRow {
-        private final String root;
-        private final String syntax;
-        private final String description;
-        private final String permissionExpression;
-        private final List<String> permissions;
-        private final List<String> allTargetPermissions;
-        private final boolean multiplePermissionChecks;
-        private final String sender;
-
-        private CommandRow(String root, String syntax, String description, String permissionExpression,
-                List<String> permissions, List<String> allTargetPermissions,
-                boolean multiplePermissionChecks, String sender) {
-            this.root = root;
-            this.syntax = syntax;
-            this.description = description;
-            this.permissionExpression = permissionExpression;
-            this.permissions = List.copyOf(permissions);
-            this.allTargetPermissions = List.copyOf(allTargetPermissions);
-            this.multiplePermissionChecks = multiplePermissionChecks;
-            this.sender = sender;
-        }
-    }
-
-    /** Capture only loaded handlers, including conditionally registered handlers. */
-    public static List<CommandRow> capture(String playerRoot, List<? extends CommandHandler> playerHandlers,
-            List<? extends CommandHandler> adminHandlers) {
-        List<CommandRow> result = new ArrayList<>();
-        result.addAll(captureGroup(playerRoot, playerHandlers));
-        result.addAll(captureGroup("/av", adminHandlers));
-        return List.copyOf(result);
-    }
-
-    private static List<CommandRow> captureGroup(String root, List<? extends CommandHandler> handlers) {
-        List<CommandRow> result = new ArrayList<>();
-        if (handlers == null) return result;
-        for (CommandHandler handler : handlers) {
-            if (handler == null) continue;
-            String syntax = safe(handler.getHelpLineCommand(root));
-            if (syntax.isEmpty()) continue;
-            String permission = safe(handler.getPerm());
-            List<String> allTarget = List.of();
-            if (handler instanceof PlayerCommandHandler) {
-                List<String> additional = ((PlayerCommandHandler) handler).getAdditionalPermissions();
-                if (additional != null) allTarget = new ArrayList<>(new LinkedHashSet<>(additional));
-            }
-            String sender = handler.isForceConsole() ? "console" :
-                    handler.isAllowConsole() ? "player or console" : "player";
-            result.add(new CommandRow(root, syntax, safe(handler.getHelpMessage()), permission,
-                    splitPermissions(permission), allTarget, handler.isAllowMultiplePermissions(), sender));
-        }
-        result.sort(Comparator.comparing((CommandRow row) -> row.syntax, String.CASE_INSENSITIVE_ORDER)
-                .thenComparing(row -> row.permissionExpression, String.CASE_INSENSITIVE_ORDER));
-        return result;
-    }
-
-    private static String safe(String text) {
-        return text == null ? "" : text.trim();
-    }
-
-    private static List<String> splitPermissions(String expression) {
-        Set<String> unique = new LinkedHashSet<>();
-        for (String part : expression.split("\\|")) {
-            String value = part.trim();
-            if (!value.isEmpty()) unique.add(value);
-        }
-        return new ArrayList<>(unique);
-    }
-
-    /** Stable JSON for future documentation bots; it contains no credentials or player data. */
-    public static String toJson(List<CommandRow> rows) {
-        JsonObject doc = new JsonObject();
-        doc.addProperty("schemaVersion", 1);
-        doc.addProperty("scope", "VotingPlugin Bukkit registered handlers");
-        JsonArray commands = new JsonArray();
-        for (CommandRow row : rows) {
-            JsonObject object = new JsonObject();
-            object.addProperty("root", row.root);
-            object.addProperty("syntax", row.syntax);
-            object.addProperty("description", row.description);
-            object.addProperty("permissionExpression", row.permissionExpression);
-            object.add("permissions", asArray(row.permissions));
-            object.add("allTargetPermissions", asArray(row.allTargetPermissions));
-            object.addProperty("multiplePermissionChecks", row.multiplePermissionChecks);
-            object.addProperty("sender", row.sender);
-            commands.add(object);
-        }
-        doc.add("commands", commands);
-        return new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create().toJson(doc) + "\n";
-    }
-
-    private static JsonArray asArray(List<String> values) {
-        JsonArray array = new JsonArray();
-        for (String value : values) array.add(value);
-        return array;
-    }
-
-    /** Reader-friendly generated snapshot for reviewing changes without running code. */
-    public static String toMarkdown(List<CommandRow> rows) {
-        StringBuilder markdown = new StringBuilder();
-        markdown.append("# VotingPlugin Bukkit commands (generated)\n\n");
-        markdown.append("This page is generated from the command handlers loaded by the running server. ");
-        markdown.append("It is not a canonical release reference: configured command labels and ");
-        markdown.append("conditionally loaded commands may differ between servers.\n\n");
-        markdown.append("Permission expressions separated by | may provide alternatives when ");
-        markdown.append("multiple-permission checks are enabled. Extra all-target permissions ");
-        markdown.append("apply only to supported bulk player commands.\n\n");
-        markdown.append("This export does not cover separate Velocity/BungeeCord proxy commands ");
-        markdown.append("or standalone plugin.yml convenience aliases.\n\n");
-
-        Map<String, List<CommandRow>> groups = new LinkedHashMap<>();
-        for (CommandRow row : rows) groups.computeIfAbsent(row.root, key -> new ArrayList<>()).add(row);
-        for (Map.Entry<String, List<CommandRow>> group : groups.entrySet()) {
-            markdown.append("## ").append(escapeCell(group.getKey())).append("\n\n");
-            markdown.append("| Command | Description | Permission expression | All-target permissions | Sender |\n");
-            markdown.append("|---|---|---|---|---|\n");
-            for (CommandRow row : group.getValue()) {
-                markdown.append("| ").append(code(row.syntax));
-                markdown.append(" | ").append(escapeCell(row.description));
-                markdown.append(" | ").append(code(row.permissionExpression.isEmpty() ? "(none)" : row.permissionExpression));
-                markdown.append(" | ").append(row.allTargetPermissions.isEmpty() ? "—" :
-                        code(String.join(", ", row.allTargetPermissions)));
-                markdown.append(" | ").append(escapeCell(row.sender)).append(" |\n");
-            }
-            markdown.append("\n");
-        }
-        return markdown.toString();
-    }
-
-    private static String code(String value) {
-        return String.valueOf((char) 96) + escapeCell(value) + (char) 96;
-    }
-
-    private static String escapeCell(String value) {
-        return safe(value).replace("\r", " ").replace("\n", " ").replace("|", "\\|")
-                .replace(String.valueOf((char) 96), "&#96;");
-    }
-
-    /**
-     * Write only when content changes, using temporary files and atomic moves
-     * when supported. No writes occur outside the plugin data folder.
-     */
-    public static boolean write(Path pluginDataFolder, String playerRoot,
-            List<? extends CommandHandler> playerHandlers, List<? extends CommandHandler> adminHandlers)
-            throws IOException {
-        List<CommandRow> rows = capture(playerRoot, playerHandlers, adminHandlers);
-        Path directory = pluginDataFolder.resolve(DIRECTORY);
-        Files.createDirectories(directory);
-        boolean jsonChanged = writeIfChanged(directory.resolve(JSON_NAME), toJson(rows));
-        boolean markdownChanged = writeIfChanged(directory.resolve(MARKDOWN_NAME), toMarkdown(rows));
-        return jsonChanged || markdownChanged;
-    }
-
-    private static boolean writeIfChanged(Path target, String content) throws IOException {
-        if (Files.isSymbolicLink(target)) throw new IOException("Refusing to overwrite symbolic link: " + target);
-        if (Files.isRegularFile(target) && content.equals(Files.readString(target, StandardCharsets.UTF_8))) {
-            return false;
-        }
-        Path temporary = Files.createTempFile(target.getParent(), target.getFileName().toString(), ".tmp");
-        try {
-            Files.writeString(temporary, content, StandardCharsets.UTF_8);
-            try {
-                Files.move(temporary, target, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
-            } catch (AtomicMoveNotSupportedException unsupported) {
-                Files.move(temporary, target, StandardCopyOption.REPLACE_EXISTING);
-            }
-        } finally {
-            Files.deleteIfExists(temporary);
-        }
-        return true;
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/CommandLoader.java

@@ -56,7 +56,6 @@ import com.bencodez.simpleapi.valuerequest.ValueRequest;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.core.maintenance.MaintenanceConfirmation;
 import com.bencodez.votingplugin.commands.executers.CommandAliases;
-import com.bencodez.votingplugin.commands.executers.CommandVote;
 import com.bencodez.votingplugin.commands.gui.AdminGUI;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVoteHelp;
 import com.bencodez.votingplugin.commands.gui.admin.AdminVotePerms;
@@ -83,7 +82,6 @@ import com.bencodez.votingplugin.commands.gui.player.VoteTotal;
 import com.bencodez.votingplugin.commands.gui.player.VoteURL;
 import com.bencodez.votingplugin.commands.gui.player.VoteURLVoteSite;
 import com.bencodez.votingplugin.commands.tabcompleter.AliasesTabCompleter;
-import com.bencodez.votingplugin.commands.tabcompleter.VoteTabCompleter;
 import com.bencodez.votingplugin.events.PlayerVoteEvent;
 import com.bencodez.votingplugin.events.PlayerVoteSiteCoolDownEndEvent;
 import com.bencodez.votingplugin.presets.VoteSitePresetSetupHandler;
@@ -117,13 +115,6 @@ public class CommandLoader {
 	private String playerPerm = "VotingPlugin.Player";
 
 	private VotingPluginMain plugin;
-	private final boolean startupVoteCommandEnabled;
-	private final String startupVoteCommandName;
-	private final boolean startupLoadCommandAliases;
-	private boolean playerCommandConfigured;
-	private PluginCommand playerRootCommand;
-	private boolean voteCommandEnabled;
-	private String voteCommandName = "vote";
 
 	/**
 	 * Constructs a new CommandLoader.
@@ -132,131 +123,6 @@ public class CommandLoader {
 	 */
 	public CommandLoader(VotingPluginMain plugin) {
 		this.plugin = plugin;
-		var config = plugin.getConfigFile();
-		startupVoteCommandEnabled = config == null || config.isVoteCommandEnabled();
-		startupVoteCommandName = config == null ? "vote" : config.getVoteCommandName();
-		startupLoadCommandAliases = config == null || config.isLoadCommandAliases();
-		voteCommandEnabled = startupVoteCommandEnabled;
-	}
-
-	/** The label actually registered at startup, including its namespace on conflict. */
-	public String getVoteCommandName() {
-		return voteCommandName;
-	}
-
-	public boolean isVoteCommandEnabled() {
-		return voteCommandEnabled;
-	}
-
-	/** Runs a generated player navigation action only while its command is available. */
-	public void performVoteCommand(Player player, String arguments) {
-		if (voteCommandEnabled) {
-			player.performCommand(voteCommandName + (arguments.isEmpty() ? "" : " " + arguments));
-		}
-	}
-
-	/** Configure only once: reloading configuration must not change command ownership. */
-	private void configurePlayerCommand() {
-		if (playerCommandConfigured) return;
-		playerCommandConfigured = true;
-		try {
-			CommandMap commandMap = getCommandMap();
-			PluginCommand root = ownedCommand("vote");
-			playerRootCommand = root;
-			if (!startupVoteCommandEnabled) {
-				for (String name : plugin.getDescription().getCommands().keySet()) {
-					if (name.equalsIgnoreCase("vote") || name.toLowerCase(Locale.ROOT).startsWith("vote")) {
-						PluginCommand command = ownedCommand(name);
-						if (command != null) unregisterCommand(commandMap, command);
-					}
-				}
-				voteCommandEnabled = false;
-				return;
-			}
-			if (root == null) {
-				voteCommandEnabled = false;
-				plugin.getLogger().warning("Unable to locate VotingPlugin's player command; player commands were not enabled.");
-				return;
-			}
-			String name = startupVoteCommandName == null ? "" : startupVoteCommandName.trim().toLowerCase(Locale.ROOT);
-			if (!name.matches("[a-z0-9][a-z0-9_-]{0,63}") || isReservedCommandName(name)) {
-				plugin.getLogger().warning("Invalid or reserved VoteCommandName; using vote. Command settings require a restart.");
-				name = "vote";
-			}
-			String namespace = plugin.getDescription().getName().toLowerCase(Locale.ROOT);
-			String fallback = namespace + ":" + name;
-			org.bukkit.command.Command existingFallback = commandMap.getCommand(fallback);
-			org.bukkit.command.Command existingLabel = commandMap.getCommand(name);
-			boolean ownedLabelCollision = existingLabel instanceof PluginCommand owned
-					&& owned.getPlugin() == plugin && owned != root;
-			if (!name.equals("vote") && ((existingFallback != null && existingFallback != root) || ownedLabelCollision)) {
-				plugin.getLogger().warning("VoteCommandName namespace is already owned; keeping vote. Command settings require a restart.");
-				name = "vote";
-				fallback = namespace + ":vote";
-			}
-			if (!name.equals("vote")) {
-				// Bukkit's register writes the fallback even when the bare label collides.
-				// Check it before unregistering or publishing the renamed command.
-				unregisterCommand(commandMap, root);
-				root.setName(name);
-				root.setLabel(name);
-				root.setAliases(List.of());
-				if (existingLabel != null && existingLabel != root) {
-					// SimpleCommandMap may overwrite another command's bare alias. Register
-					// only our free fallback in that case, preserving the alias owner too.
-					root.setLabel(fallback);
-					if (!root.register(commandMap)) throw new IllegalStateException("Player command registration was rejected");
-					Map<String, org.bukkit.command.Command> registrations = getKnownCommands(commandMap);
-					// Paper forwards put/get to Brigadier; HashMap.putIfAbsent can bypass it.
-					if (registrations.get(fallback) != null) throw new IllegalStateException("Player command namespace became occupied");
-					registrations.put(fallback, root);
-				} else {
-					commandMap.register(namespace, root);
-				}
-			}
-			voteCommandName = commandMap.getCommand(name) == root ? name : fallback;
-			voteCommandEnabled = commandMap.getCommand(voteCommandName) == root;
-			if (voteCommandEnabled) {
-				root.setExecutor(new CommandVote(plugin));
-				root.setTabCompleter(new VoteTabCompleter());
-				if (!voteCommandName.equals(name)) {
-					plugin.getLogger().warning("Player command label is already owned; use /" + voteCommandName + " instead.");
-				}
-			} else {
-				plugin.getLogger().warning("Unable to register VotingPlugin's player command without replacing another owner.");
-			}
-		} catch (ReflectiveOperationException | RuntimeException failure) {
-			throw new IllegalStateException("Unable to configure VotingPlugin's player command safely", failure);
-		}
-	}
-
-	private boolean isReservedCommandName(String name) {
-		for (var entry : plugin.getDescription().getCommands().entrySet()) {
-			if (entry.getKey().equalsIgnoreCase("vote")) continue;
-			if (entry.getKey().equalsIgnoreCase(name)) return true;
-			Object aliases = entry.getValue().get("aliases");
-			if (aliases instanceof String alias && alias.equalsIgnoreCase(name)) return true;
-			if (aliases instanceof Iterable<?> values) {
-				for (Object alias : values) if (name.equalsIgnoreCase(String.valueOf(alias))) return true;
-			}
-		}
-		return false;
-	}
-
-	private PluginCommand ownedCommand(String name) {
-		PluginCommand command = plugin.getCommand(name);
-		if (command != null && command.getPlugin() == plugin) return command;
-		try {
-			// A plugin may have displaced the primary and fallback labels while a short
-			// alias still points at our command. Disable must remove that object too.
-			for (org.bukkit.command.Command candidate : getKnownCommands(getCommandMap()).values()) {
-				if (candidate instanceof PluginCommand owned && owned.getPlugin() == plugin
-						&& owned.getName().equalsIgnoreCase(name)) return owned;
-			}
-		} catch (ReflectiveOperationException failure) {
-			throw new IllegalStateException("Unable to inspect owned command registrations", failure);
-		}
-		return null;
 	}
 
 	void runForCommandSender(CommandSender sender, Runnable task) {
@@ -354,7 +220,7 @@ public class CommandLoader {
 				java.util.List<VotingPluginUser> users = new java.util.ArrayList<>();
 				try {
 					for (String uuidString : plugin.getUserManager().getAllUUIDs()) {
-						users.add(plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuidString), true));
+						users.add(plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuidString)));
 					}
 				} catch (Throwable failure) {
 					plugin.debug(failure);
@@ -537,28 +403,26 @@ public class CommandLoader {
 	 * @return true if player has permission
 	 */
 	public boolean hasPermission(Player player, String cmd) {
-		cmd = cmd.toLowerCase(Locale.ROOT);
 		if (cmd.startsWith("votingplugin:")) {
 			cmd = cmd.substring("votingplugin:".length());
 		}
 
-		for (var entry : commands.entrySet()) {
-			if (entry.getKey().equalsIgnoreCase(cmd)) return entry.getValue().hasPerm(player);
+		if (commands.containsKey(cmd)) {
+			return commands.get(cmd).hasPerm(player);
 		}
 
 		boolean adminCommand = false;
-		String rootLabel = voteCommandName.substring(voteCommandName.indexOf(':') + 1);
 
-		if (cmd.equals("adminvote") || cmd.startsWith("adminvote ")) {
+		if (cmd.startsWith("vote")) {
+			cmd = cmd.substring("vote".length());
+		} else if (cmd.startsWith("v")) {
+			cmd = cmd.substring(1);
+		} else if (cmd.startsWith("av")) {
 			adminCommand = true;
-			cmd = cmd.substring("adminvote".length()).trim();
-		} else if (cmd.equals("av") || cmd.startsWith("av ")) {
+			cmd = cmd.substring("av".length());
+		} else if (cmd.startsWith("adminvote")) {
 			adminCommand = true;
-			cmd = cmd.substring("av".length()).trim();
-		} else if (voteCommandEnabled && (cmd.equals(rootLabel) || cmd.startsWith(rootLabel + " "))) {
-			cmd = cmd.substring(rootLabel.length()).trim();
-		} else {
-			return false;
+			cmd = cmd.substring("adminvote".length());
 		}
 		// plugin.debug(cmd);
 		if (!adminCommand) {
@@ -595,11 +459,13 @@ public class CommandLoader {
 	 * @return true if it's a VotingPlugin command
 	 */
 	public boolean isVotingPluginCommand(Player player, String cmd) {
-		try {
-			org.bukkit.command.Command command = getCommandMap().getCommand(cmd);
-			return command instanceof PluginCommand owned && owned.getPlugin() == plugin;
-		} catch (ReflectiveOperationException failure) {
-			plugin.debug(failure);
+		if (plugin.getCommand(cmd) != null || cmd.startsWith("votingplugin")) {
+			return true;
+		}
+		for (String str : commands.keySet()) {
+			if (str.equalsIgnoreCase(cmd)) {
+				return true;
+			}
 		}
 		return false;
 	}
@@ -607,31 +473,9 @@ public class CommandLoader {
 	/**
 	 * Load admin vote command.
 	 */
-	private void clearDiscordMessageId(CommandSender sender, TopVoter top) {
-		try {
-			plugin.getTimer().execute(() -> {
-				boolean confirmed;
-				try { confirmed = clearDiscordMessageId(top); }
-				catch (RuntimeException failure) { confirmed = false; }
-				String message = confirmed ? "&cCleared discord message ID for " + top.toString()
-						: "&cUnable to confirm the cleared Discord message ID; check storage before restarting.";
-				runForCommandSender(sender, () -> sender.sendMessage(MessageAPI.colorize(message)));
-			});
-		} catch (RuntimeException rejected) {
-			runForCommandSender(sender, () -> sender.sendMessage(MessageAPI.colorize(
-					"&cUnable to schedule clearing the Discord message ID; no changes made.")));
-		}
-	}
-
-	private boolean clearDiscordMessageId(TopVoter top) {
-		var discord = plugin.getDiscordHandler();
-		return discord != null ? discord.clearTopVoterMessageId(top)
-				: plugin.getServerData().setTopVoterMessageIdConfirmed(top, 0L);
-	}
-
 	private void loadAdminVoteCommand() {
 		plugin.setAdminVoteCommand(new ArrayList<>());
-        DateVoteMilestoneCommands.register(plugin, adminPerm);
+		com.bencodez.votingplugin.npc.VotingNPCCommands.register(plugin);
 
 		plugin.getAdminVoteCommand().add(new CommandHandler(plugin, new String[] { "CurrentPluginTime" },
 				"VotingPlugin.Commands.AdminVote.CurrentPluginTime|" + adminPerm, "Current plugin time") {
@@ -866,7 +710,7 @@ public class CommandLoader {
 					@Override
 					public void executeSinglePlayer(CommandSender sender, String[] args) {
 						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(args[1]);
-						if (!UserStorage.MYSQL.equals(plugin.getStorageType())) user.cache();
+						user.cache();
 						user.removePoints(Integer.parseInt(args[3]), removed -> {
 							if (!removed) {
 								runForCommandSender(sender, () -> sender.sendMessage(MessageAPI.colorize(
@@ -2970,7 +2814,9 @@ public class CommandLoader {
 					public void execute(CommandSender sender, String[] args) {
 						String topVoter = args[1];
 						TopVoter top = TopVoter.getTopVoter(topVoter);
-						clearDiscordMessageId(sender, top);
+						plugin.getServerData().setTopVoterMessageId(top, 0);
+						plugin.getDiscordHandler().getTopVoterMessageIds().put(top, 0L);
+						sendMessage(sender, "&cCleared discord message ID for " + top.toString());
 					}
 				});
 
@@ -3124,10 +2970,9 @@ public class CommandLoader {
 	public void loadAliases() {
 		commands = new HashMap<>();
 		aliasCommandNames.clear();
-		configurePlayerCommand();
 
 		// Bukkit registers plugin.yml commands before this loader runs.
-		if (!startupLoadCommandAliases) {
+		if (!plugin.getConfigFile().isLoadCommandAliases()) {
 			unregisterOptionalPluginYMLCommands();
 		} else {
 			unregisterDisabledPluginYMLCommands();
@@ -3135,7 +2980,7 @@ public class CommandLoader {
 
 		// If false: still wire permissions, but don't wire alias executors/tab
 		// completers.
-		final boolean enableAliases = startupLoadCommandAliases;
+		final boolean enableAliases = plugin.getConfigFile().isLoadCommandAliases();
 
 		// ---------------------------
 		// /vote aliases
@@ -3167,18 +3012,16 @@ public class CommandLoader {
 			}
 			registerAdditionalPermissions(Bukkit.getPluginManager(), cmdHandle);
 
-			if (argLength > 0 && voteCommandEnabled) {
+			if (argLength > 0) {
 				String[] args = cmdHandle.getArgs()[0].split("&");
 
 				for (String arg : args) {
 					String commandName = "vote" + arg;
-					// A renamed root may equal a synthetic alias absent from plugin.yml.
-					if (ownedCommand(commandName) == playerRootCommand && playerRootCommand != null) continue;
 					commands.put(commandName, cmdHandle);
 					aliasCommandNames.add(commandName.toLowerCase(Locale.ROOT));
 
 					try {
-						PluginCommand command = ownedCommand(commandName);
+						PluginCommand command = plugin.getCommand(commandName);
 						if (command == null) {
 							plugin.devDebug("Command " + commandName + " not found in plugin.yml");
 							continue;
@@ -3252,13 +3095,11 @@ public class CommandLoader {
 
 				for (String arg : args) {
 					String commandName = "adminvote" + arg;
-					// A renamed root may equal a synthetic alias absent from plugin.yml.
-					if (ownedCommand(commandName) == playerRootCommand && playerRootCommand != null) continue;
 					commands.put(commandName, cmdHandle);
 					aliasCommandNames.add(commandName.toLowerCase(Locale.ROOT));
 
 					try {
-						PluginCommand command = ownedCommand(commandName);
+						PluginCommand command = plugin.getCommand(commandName);
 						if (command == null) {
 							plugin.devDebug("Command " + commandName + " not found in plugin.yml");
 							continue;
@@ -3324,8 +3165,8 @@ public class CommandLoader {
 						|| commandName.equalsIgnoreCase("av")) {
 					continue;
 				}
-				PluginCommand command = ownedCommand(commandName);
-				if (command != null && command != playerRootCommand) {
+				PluginCommand command = plugin.getCommand(commandName);
+				if (command != null) {
 					unregisterCommand(commandMap, command);
 				}
 			}
@@ -3339,8 +3180,8 @@ public class CommandLoader {
 		try {
 			CommandMap commandMap = getCommandMap();
 			for (String commandName : disabledAliasCommandNames) {
-				PluginCommand command = ownedCommand(commandName);
-				if (command != null && command != playerRootCommand) {
+				PluginCommand command = plugin.getCommand(commandName);
+				if (command != null) {
 					unregisterCommand(commandMap, command);
 				}
 			}
@@ -3352,7 +3193,22 @@ public class CommandLoader {
 	/** Removes the command and all labels that still point to it from Bukkit's map. */
 	private void unregisterCommand(CommandMap commandMap, PluginCommand command) throws ReflectiveOperationException {
 		command.unregister(commandMap);
-		Map<String, org.bukkit.command.Command> knownCommands = getKnownCommands(commandMap);
+		java.lang.reflect.Field field = null;
+		Class<?> commandMapClass = commandMap.getClass();
+		while (commandMapClass != null && field == null) {
+			try {
+				field = commandMapClass.getDeclaredField("knownCommands");
+			} catch (NoSuchFieldException ignored) {
+				commandMapClass = commandMapClass.getSuperclass();
+			}
+		}
+		if (field == null) {
+			throw new NoSuchFieldException("knownCommands");
+		}
+		field.setAccessible(true);
+		@SuppressWarnings("unchecked")
+		Map<String, org.bukkit.command.Command> knownCommands =
+				(Map<String, org.bukkit.command.Command>) field.get(commandMap);
 		Set<String> removedLabels = new HashSet<>();
 		for (Map.Entry<String, org.bukkit.command.Command> entry : knownCommands.entrySet()) {
 			if (entry.getValue() == command) {
@@ -3381,27 +3237,6 @@ public class CommandLoader {
 		}
 	}
 
-	/** Reads the same Bukkit-owned map used by exact-object unregister. */
-	private Map<String, org.bukkit.command.Command> getKnownCommands(CommandMap commandMap) throws ReflectiveOperationException {
-		java.lang.reflect.Field field = null;
-		Class<?> commandMapClass = commandMap.getClass();
-		while (commandMapClass != null && field == null) {
-			try {
-				field = commandMapClass.getDeclaredField("knownCommands");
-			} catch (NoSuchFieldException ignored) {
-				commandMapClass = commandMapClass.getSuperclass();
-			}
-		}
-		if (field == null) {
-			throw new NoSuchFieldException("knownCommands");
-		}
-		field.setAccessible(true);
-		@SuppressWarnings("unchecked")
-		Map<String, org.bukkit.command.Command> knownCommands =
-				(Map<String, org.bukkit.command.Command>) field.get(commandMap);
-		return knownCommands;
-	}
-
 	/** Gets Bukkit's command map without depending on a CraftBukkit package name. */
 	private CommandMap getCommandMap() throws ReflectiveOperationException {
 		java.lang.reflect.Method method = plugin.getServer().getClass().getMethod("getCommandMap");
@@ -3465,6 +3300,14 @@ public class CommandLoader {
 	 * Load tab complete.
 	 */
 	public void loadTabComplete() {
+		TabCompleteHandler.getInstance().addTabCompleteOption(new TabCompleteHandle("(npcid)", new ArrayList<>()) {
+			@Override public void reload() { updateReplacements(); }
+			@Override public void updateReplacements() {
+				var manager = plugin.getVotingNPCManager();
+				setReplace(manager == null ? new ArrayList<>() : new ArrayList<>(manager.definitions().stream()
+						.map(com.bencodez.votingplugin.npc.VotingNPCDefinition::id).toList()));
+			}
+		});
 		ArrayList<String> sites = new ArrayList<>();
 		for (VoteSite site : plugin.getVoteSiteManager().getVoteSitesEnabled()) {
 			sites.add(site.getKey());
@@ -3652,15 +3495,7 @@ public class CommandLoader {
 	 */
 	private void loadVoteCommand() {
 		plugin.setVoteCommand(new ArrayList<>());
-		plugin.getVoteCommand().add(new CommandHandler(plugin, new String[] { "DateEvents" },
-                "VotingPlugin.Commands.Vote.DateEvents|" + playerPerm, "View date-window vote milestone progress") {
-            @Override public void execute(CommandSender sender, String[] args) {
-                if (sender instanceof Player player) plugin.getDateVoteMilestones().progress(player);
-                else sender.sendMessage("Run /vote dateevents as a player.");
-            }
-        });
-
-        plugin.getVoteCommand().add(new CommandHandler(plugin, new String[] { "Help&?" },
+		plugin.getVoteCommand().add(new CommandHandler(plugin, new String[] { "Help&?" },
 				"VotingPlugin.Commands.Vote.Help|" + playerPerm, "View help page") {
 
 			@Override
@@ -4243,9 +4078,6 @@ public class CommandLoader {
 			}
 		}
 
-		// Preserve administrator-defined matches ahead of this new fallback.
-		com.bencodez.votingplugin.streaks.VoteStreaksCommand.register(plugin);
-
 		ArrayList<CommandHandler> avCommands = com.bencodez.advancedcore.command.CommandLoader.getInstance()
 				.getBasicCommands("VotingPlugin");
 		for (CommandHandler cmd : avCommands) {
@@ -4312,7 +4144,7 @@ public class CommandLoader {
 		} else if (MessageAPI.startsWithIgnoreCase(slot, "today")) {
 			new VoteToday(plugin, player, user, 1).open();
 		} else if (MessageAPI.startsWithIgnoreCase(slot, "help")) {
-			performVoteCommand(player, "help");
+			player.performCommand("vote help");
 		} else if (MessageAPI.startsWithIgnoreCase(slot, "shop")) {
 			new VoteShop(plugin, player, user).open();
 		} else if (MessageAPI.startsWithIgnoreCase(slot, "lastmonth")) {
@@ -4321,8 +4153,6 @@ public class CommandLoader {
 			new VoteBest(plugin, player, user).open();
 		} else if (MessageAPI.startsWithIgnoreCase(slot, "streak")) {
 			new VoteStreak(plugin, player, user).open();
-		} else if (MessageAPI.startsWithIgnoreCase(slot, "streaks")) {
-			 plugin.getVoteStreaksMenu().open(player);
 		}
 	}
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/DateVoteMilestoneCommands.java

@@ -1,41 +0,0 @@
-package com.bencodez.votingplugin.commands;
-
-import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.simpleapi.command.TabCompleteHandler;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.specialrewards.datemilestones.DateVoteMilestones.AdminAction;
-import org.bukkit.command.CommandSender;
-
-/** Exact-target administration; storage and confirmed completion belong to the manager. */
-final class DateVoteMilestoneCommands {
-    private DateVoteMilestoneCommands() { }
-
-    static void register(VotingPluginMain plugin, String adminPermission) {
-        // The SDK only matches registered variable tokens; its built-in player token also rewrites fuzzy names.
-        for (String token : new String[] { "(player-id)", "(date-event)", "(vote-count)", "(date-milestone)" })
-            TabCompleteHandler.getInstance().addTabCompleteOption(token, new java.util.ArrayList<>());
-        for (AdminAction action : AdminAction.values()) {
-            String[] arguments = switch (action) {
-                case Status, Preview -> new String[] { "DateVoteMilestone&DVM", action.name(), "(player-id)", "(date-event)" };
-                case SetVotes -> new String[] { "DateVoteMilestone&DVM", action.name(), "(player-id)", "(date-event)", "(vote-count)" };
-                case Force, ForceNoLimits -> new String[] { "DateVoteMilestone&DVM", action.name(), "(player-id)", "(date-event)", "(date-milestone)" };
-            };
-            String description = switch (action) {
-                case Status, Preview -> "Inspect date event counts and reward fences without submitting rewards";
-                case SetVotes -> "Set date event count (0-4096), preserving receipt IDs and reward fences";
-                case Force -> "Force selected date milestones, preserving prior submission and uncertain reservation fences";
-                case ForceNoLimits -> "Repeat submitted date milestones; uncertain reservations remain blocked";
-            };
-            CommandHandler handler = new CommandHandler(plugin, arguments,
-                    "VotingPlugin.Commands.AdminVote.DateVoteMilestone." + action.name() + "|" + adminPermission, description) {
-                @Override public void execute(CommandSender sender, String[] args) {
-                    var manager = plugin.getDateVoteMilestones();
-                    if (manager == null) { sender.sendMessage("Date milestones are unavailable."); return; }
-                    manager.administer(sender, action, args[2], args[3], args.length > 4 ? args[4] : null);
-                }
-            };
-            handler.setAllowMultiplePermissions(true);
-            plugin.getAdminVoteCommand().add(handler);
-        }
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/executers/CommandAliases.java

@@ -74,7 +74,7 @@ public class CommandAliases implements CommandExecutor {
 		if (adminCommand) {
 			sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandAdminVote()));
 		} else {
-			sender.sendMessage(MessageAPI.colorize(plugin.formatVoteCommandMessage(plugin.getConfigFile().getFormatInvalidCommandVote())));
+			sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		}
 		return true;
 	}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/executers/CommandVote.java

@@ -35,7 +35,7 @@ public class CommandVote implements CommandExecutor {
 		}
 
 		// invalid command
-		sender.sendMessage(MessageAPI.colorize(plugin.formatVoteCommandMessage(plugin.getConfigFile().getFormatInvalidCommandVote())));
+		sender.sendMessage(MessageAPI.colorize(plugin.getConfigFile().getFormatInvalidCommandVote()));
 		return true;
 	}
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/AdminVotePerms.java

@@ -77,16 +77,16 @@ public class AdminVotePerms extends GUIHandler {
 		for (CommandHandler handle : plugin.getVoteCommand()) {
 			if (sender instanceof Player) {
 				if (handle.hasPerm(sender)) {
-					msg.add("&6" + handle.getHelpLineCommand(plugin.getVoteCommandPrefix()) + " : "
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
 							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &atrue");
 				} else {
-					msg.add("&6" + handle.getHelpLineCommand(plugin.getVoteCommandPrefix()) + " : "
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
 							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &cfalse");
 				}
 			} else {
-				msg.add(handle.getHelpLineCommand(plugin.getVoteCommandPrefix()) + " : " + handle.getPerm().split(Pattern.quote("|"))[0]);
+				msg.add(handle.getHelpLineCommand("/vote") + " : " + handle.getPerm().split(Pattern.quote("|"))[0]);
 			}
-			addAdditionalPermissions(msg, sender, handle, plugin.getVoteCommandPrefix());
+			addAdditionalPermissions(msg, sender, handle, "/vote");
 
 		}
 
@@ -164,13 +164,13 @@ public class AdminVotePerms extends GUIHandler {
 
 			for (CommandHandler handle : plugin.getVoteCommand()) {
 				if (handle.hasPerm(p)) {
-					msg.add("&6" + handle.getHelpLineCommand(plugin.getVoteCommandPrefix()) + " : "
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
 							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &atrue");
 				} else {
-					msg.add("&6" + handle.getHelpLineCommand(plugin.getVoteCommandPrefix()) + " : "
+					msg.add("&6" + handle.getHelpLineCommand("/vote") + " : "
 							+ handle.getPerm().split(Pattern.quote("|"))[0] + " : &cfalse");
 				}
-				addAdditionalPermissions(msg, p, handle, plugin.getVoteCommandPrefix());
+				addAdditionalPermissions(msg, p, handle, "/vote");
 
 			}
 
@@ -237,7 +237,7 @@ public class AdminVotePerms extends GUIHandler {
 		msg.add("  ");
 
 		for (CommandHandler handle : plugin.getVoteCommand()) {
-			msg.add(handle.getHelpLineCommand(plugin.getVoteCommandPrefix()));
+			msg.add(handle.getHelpLineCommand("/vote"));
 			msg.add("  " + handle.getPerm());
 			msg.add("  " + handle.getHelpMessage());
 			for (String permission : additionalPermissions(handle)) {

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/admin/AdminVoteTopPoints.java

@@ -80,7 +80,7 @@ public class AdminVoteTopPoints extends GUIHandler {
 					LinkedHashMap<TopVoterPlayer, Integer> raw = new LinkedHashMap<>();
 					for (String uuidString : plugin.getVotingPluginUserManager().getAllUUIDs()) {
 						UUID uuid = UUID.fromString(uuidString);
-						VotingPluginUser vpUser = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid, true);
+						VotingPluginUser vpUser = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
 						vpUser.userDataFetechMode(UserDataFetchMode.NO_CACHE);
 						int points = vpUser.getPoints();
 						if (points <= 0) continue;

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/DateVoteEventsMenu.java

@@ -1,170 +0,0 @@
-package com.bencodez.votingplugin.commands.gui.player;
-
-import java.time.Instant;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.function.BooleanSupplier;
-
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.entity.HumanEntity;
-
-import com.bencodez.advancedcore.api.inventory.BInventory;
-import com.bencodez.advancedcore.api.inventory.BInventory.ClickEvent;
-import com.bencodez.advancedcore.api.inventory.BInventoryButton;
-import com.bencodez.advancedcore.api.item.ItemBuilder;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.core.datemilestones.DateVoteProgressSnapshot;
-import com.bencodez.votingplugin.core.datemilestones.DateVoteProgressSnapshot.Availability;
-import com.bencodez.votingplugin.core.datemilestones.DateVoteProgressSnapshot.Event;
-import com.bencodez.votingplugin.core.datemilestones.DateVoteProgressSnapshot.Milestone;
-
-/** Entity-thread presentation of an immutable storage-worker result. */
-public final class DateVoteEventsMenu {
-    private static final int PAGE_SIZE = 45;
-    private static final int LIMIT = 64;
-    private static final String OPEN_GUARD = "DateVoteEventsOpenGuard";
-    private record OpenGuard(java.util.UUID owner, BooleanSupplier eligible) { }
-    private static final DateTimeFormatter TIME = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss");
-
-    private final VotingPluginMain plugin;
-    private final Player player;
-    private final DateVoteProgressSnapshot snapshot;
-    private final BooleanSupplier current;
-
-    private DateVoteEventsMenu(VotingPluginMain plugin, Player player, DateVoteProgressSnapshot snapshot,
-            BooleanSupplier current) {
-        this.plugin = plugin;
-        this.player = player;
-        this.snapshot = snapshot;
-        this.current = current;
-    }
-
-    public static void open(VotingPluginMain plugin, Player player, DateVoteProgressSnapshot snapshot,
-            BooleanSupplier current) {
-        new DateVoteEventsMenu(plugin, player, snapshot, current).list(0);
-    }
-
-    private boolean eligible() {
-        return current.getAsBoolean() && plugin.isEnabled() && player.isOnline()
-                && (player.hasPermission("VotingPlugin.Commands.Vote.DateEvents")
-                        || player.hasPermission("VotingPlugin.Player"));
-    }
-
-    private BInventory inventory(String title) {
-        BInventory inventory = new BInventory(title);
-        inventory.setMaxInvSize(54);
-        inventory.setPages(false);
-        inventory.runClicksSync();
-        inventory.dontClose();
-        inventory.addData(OPEN_GUARD, new OpenGuard(player.getUniqueId(), this::eligible));
-        return inventory;
-    }
-
-    /** Called at Bukkit's final InventoryOpenEvent, after AdvancedCore's deferred callback. */
-    public static boolean permitsOpen(BInventory inventory, HumanEntity viewer) {
-        Object value = inventory.getData(OPEN_GUARD);
-        return !(value instanceof OpenGuard guard)
-                || guard.owner().equals(viewer.getUniqueId()) && guard.eligible().getAsBoolean();
-    }
-
-    private void list(int page) {
-        if (!eligible()) return;
-        List<Event> events = snapshot.events().stream().limit(LIMIT).toList();
-        BInventory inventory = inventory("Date vote events " + (page + 1) + "/" + pages(events.size()));
-        int end = Math.min(events.size(), (page + 1) * PAGE_SIZE);
-        for (int index = page * PAGE_SIZE; index < end; index++) {
-            Event event = events.get(index);
-            inventory.addButton(index % PAGE_SIZE, button(Material.PAPER,
-                    event.definition().displayName(), eventLore(event), () -> detail(event, 0, page)));
-        }
-        List<String> summary = new ArrayList<>();
-        if (events.isEmpty()) summary.add("No date vote events configured.");
-        else if (events.stream().noneMatch(event -> event.definition().enabled()))
-            summary.add("No enabled date vote events.");
-        else summary.add("Select an event to view milestones.");
-        summary.add("Snapshot: " + Instant.ofEpochMilli(snapshot.capturedAt()));
-        inventory.addButton(49, button(Material.BOOK, "Date vote events", summary, () -> {}));
-        if (page > 0) inventory.addButton(45, button(Material.ARROW, "Previous page", List.of(), () -> list(page - 1)));
-        if (end < events.size()) inventory.addButton(53, button(Material.ARROW, "Next page", List.of(), () -> list(page + 1)));
-        if (eligible()) inventory.openInventory(player);
-    }
-
-    private void detail(Event event, int page, int listPage) {
-        if (!eligible()) return;
-        List<Milestone> milestones = event.milestones().stream().limit(LIMIT).toList();
-        BInventory inventory = inventory("Date vote milestones " + (page + 1) + "/" + pages(milestones.size()));
-        int end = Math.min(milestones.size(), (page + 1) * PAGE_SIZE);
-        for (int index = page * PAGE_SIZE; index < end; index++) {
-            Milestone milestone = milestones.get(index);
-            List<String> lore = new ArrayList<>();
-            lore.add("ID: " + milestone.id());
-            lore.add("Enabled: " + milestone.enabled());
-            lore.add("Award state: " + event.awardState(milestone.threshold()));
-            List<String> types = milestone.rewardTypes().stream().limit(LIMIT)
-                    .map(type -> type.matches("[A-Za-z0-9_-]{1,64}") ? type : "Other").distinct().toList();
-            lore.add("Reward types: " + (types.isEmpty() ? "none" : String.join(", ", types)));
-            inventory.addButton(index % PAGE_SIZE, button(Material.PAPER, milestone.threshold() + " votes", lore, () -> {}));
-        }
-        List<String> summary = eventLore(event);
-        if (milestones.isEmpty()) summary.add("No milestones configured.");
-        inventory.addButton(48, button(Material.BOOK, event.definition().displayName(), summary, () -> {}));
-        inventory.addButton(49, button(Material.ARROW, "Back to events", List.of(), () -> list(listPage)));
-        if (page > 0) inventory.addButton(45, button(Material.ARROW, "Previous page", List.of(), () -> detail(event, page - 1, listPage)));
-        if (end < milestones.size()) inventory.addButton(53, button(Material.ARROW, "Next page", List.of(), () -> detail(event, page + 1, listPage)));
-        if (eligible()) inventory.openInventory(player);
-    }
-
-    private List<String> eventLore(Event event) {
-        var definition = event.definition();
-        List<String> lore = new ArrayList<>();
-        lore.add("ID: " + definition.id());
-        lore.add("Status: " + event.status(snapshot.capturedAt()));
-        ZoneId zone = ZoneId.of(definition.timezone());
-        lore.add("Start: " + TIME.format(Instant.ofEpochMilli(definition.start()).atZone(zone)));
-        lore.add("End (exclusive): " + TIME.format(Instant.ofEpochMilli(definition.end()).atZone(zone)));
-        lore.add("Timezone: " + definition.timezone());
-        if (event.availability() == Availability.OWNED) {
-            lore.add("Votes: " + event.votes());
-            lore.add("Next milestone: " + (event.nextThreshold().isPresent() ? event.nextThreshold().getAsInt() + " votes" : "none"));
-        } else if (event.availability() == Availability.REMOTE) {
-            lore.add("Progress owned by: " + definition.accountingServer());
-            lore.add("Progress unavailable on this server.");
-        } else {
-            lore.add("Progress unavailable: accounting read failed.");
-        }
-        return lore;
-    }
-
-    private static int pages(int size) {
-        return Math.max(1, (size + PAGE_SIZE - 1) / PAGE_SIZE);
-    }
-
-    private BInventoryButton button(Material material, String name, List<String> lore, Runnable action) {
-        List<String> lines = List.copyOf(lore);
-        return new BInventoryButton(new ItemBuilder(material)) {
-            // ItemBuilder evaluates display Javascript and formatting while rendering. Render only
-            // the blank material through it, then apply snapshot text literally to Bukkit metadata.
-            @Override public ItemStack getItem() {
-                ItemStack item = new ItemBuilder(material).toItemStack();
-                ItemMeta meta = item.getItemMeta();
-                if (meta != null) {
-                    meta.setDisplayName(name);
-                    meta.setLore(lines);
-                    item.setItemMeta(meta);
-                }
-                return item;
-            }
-            @Override public ItemStack getItem(Player ignored) { return getItem(); }
-            @Override public ItemStack getItem(Player ignored, HashMap<String, String> placeholders) { return getItem(); }
-            @Override public void onClick(ClickEvent click) {
-                if (eligible()) action.run();
-            }
-        }.dontClose();
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/VoteHelp.java

@@ -55,7 +55,6 @@ public class VoteHelp extends GUIHandler {
 	 */
 	public ArrayList<TextComponent> helpText(CommandSender sender) {
 		ArrayList<TextComponent> msg = new ArrayList<>();
-		if (!plugin.isVoteCommandEnabled()) return msg;
 		HashMap<String, TextComponent> unsorted = new HashMap<>();
 
 		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
@@ -71,7 +70,7 @@ public class VoteHelp extends GUIHandler {
 		}
 		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
 			if (!requirePerms || cmdHandle.hasPerm(sender)) {
-				unsorted.put(cmdHandle.getHelpLineCommand(plugin.getVoteCommandPrefix()), cmdHandle.getHelpLine(plugin.getVoteCommandPrefix(),
+				unsorted.put(cmdHandle.getHelpLineCommand("/vote"), cmdHandle.getHelpLine("/vote",
 						plugin.getConfigFile().getFormatCommandsVoteHelpLine(), hoverColor));
 			}
 		}
@@ -93,15 +92,14 @@ public class VoteHelp extends GUIHandler {
 	 */
 	public ArrayList<TextComponent> helpTextLegacy(CommandSender sender) {
 		ArrayList<TextComponent> msg = new ArrayList<>();
-		if (!plugin.isVoteCommandEnabled()) return msg;
 		HashMap<String, TextComponent> unsorted = new HashMap<>();
 
 		boolean requirePerms = plugin.getConfigFile().isFormatCommandsVoteHelpRequirePermission();
 
 		for (CommandHandler cmdHandle : plugin.getVoteCommand()) {
 			if (!requirePerms || cmdHandle.hasPerm(sender)) {
-				unsorted.put(cmdHandle.getHelpLineCommand(plugin.getVoteCommandPrefix()),
-						cmdHandle.getHelpLine(plugin.getVoteCommandPrefix(), plugin.getConfigFile().getFormatCommandsVoteHelpLine()));
+				unsorted.put(cmdHandle.getHelpLineCommand("/vote"),
+						cmdHandle.getHelpLine("/vote", plugin.getConfigFile().getFormatCommandsVoteHelpLine()));
 			}
 		}
 		ArrayList<String> unsortedList = new ArrayList<>();

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/VoteToday.java

@@ -60,7 +60,7 @@ public class VoteToday extends GUIHandler {
 									Player clicked = player.getServer().getPlayer(payload.owner());
 									if (clicked != null) {
 										VotingPluginUser clickedUser = plugin.getVotingPluginUserManager()
-												.getVotingPluginUser(uuid, true);
+												.getVotingPluginUser(uuid);
 										new VoteGUI(plugin, clicked, clickedUser).open(
 												GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
 									}
@@ -161,7 +161,7 @@ public class VoteToday extends GUIHandler {
 				inv.addButton(inv.getNextSlot(), new BInventoryButton(item) {
 					@Override
 					public void onClick(ClickEvent clickEvent) {
-						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid, true);
+						VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);
 						new VoteGUI(plugin, player, user)
 								.open(GUIMethod.valueOf(plugin.getGui().getGuiMethodGUI().toUpperCase()));
 					}

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/VoteTopVoter.java

@@ -51,7 +51,7 @@ public class VoteTopVoter extends GUIHandler {
 		String topVoter = top.getName();
 
 		@SuppressWarnings("unchecked")
-		LinkedHashMap<TopVoterPlayer, Integer> topVotes = (LinkedHashMap<TopVoterPlayer, Integer>) plugin.getTopVoterDisplay(top)
+		LinkedHashMap<TopVoterPlayer, Integer> topVotes = (LinkedHashMap<TopVoterPlayer, Integer>) plugin.getTopVoter(top)
 				.clone();
 
 		com.bencodez.simpleapi.dialog.MultiActionDialogBuilder dialog = plugin.getDialogService().multiAction(player)
@@ -148,7 +148,7 @@ public class VoteTopVoter extends GUIHandler {
 			String topVoter = top.getName();
 			@SuppressWarnings("unchecked")
 			LinkedHashMap<TopVoterPlayer, Integer> topVotes = (LinkedHashMap<TopVoterPlayer, Integer>) plugin
-					.getTopVoterDisplay(top).clone();
+					.getTopVoter(top).clone();
 			users = topVotes.entrySet();
 
 			ConfigurationSection customization = plugin.getGui().getChestVoteTopCustomization();

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/VoteTopVoterLastMonth.java

@@ -31,7 +31,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 	
 	@Override
 	public void onDialog(Player player) {
-		Set<Entry<TopVoterPlayer, Integer>> users = plugin.getLastMonthTopVoterDisplay().entrySet();
+		Set<Entry<TopVoterPlayer, Integer>> users = plugin.getLastMonthTopVoter().entrySet();
 
 		com.bencodez.simpleapi.dialog.MultiActionDialogBuilder dialog = plugin.getDialogService().multiAction(player)
 				.placeholder("player", user.getPlayerName())
@@ -91,7 +91,7 @@ public class VoteTopVoterLastMonth extends GUIHandler {
 	public void onChest(Player player) {
 		Set<Entry<TopVoterPlayer, Integer>> users = null;
 
-		users = plugin.getLastMonthTopVoterDisplay().entrySet();
+		users = plugin.getLastMonthTopVoter().entrySet();
 
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteTopName());
 		inv.addPlaceholder("topvoter", "Last Month");

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/VoteTopVoterPreviousMonths.java

@@ -60,7 +60,7 @@ public class VoteTopVoterPreviousMonths extends GUIHandler {
 			return;
 		}
 
-		Set<Entry<TopVoterPlayer, Integer>> users = plugin.getPreviousMonthTopVoterDisplay(yearMonth).entrySet();
+		Set<Entry<TopVoterPlayer, Integer>> users = plugin.getPreviousMonthsTopVoters().get(yearMonth).entrySet();
 
 		com.bencodez.simpleapi.dialog.MultiActionDialogBuilder dialog = plugin.getDialogService().multiAction(player)
 				.placeholder("player", user.getPlayerName())
@@ -160,7 +160,7 @@ public class VoteTopVoterPreviousMonths extends GUIHandler {
 			player.sendMessage(ChatColor.RED + "Can't open previous months, no data");
 			return;
 		}
-		users = plugin.getPreviousMonthTopVoterDisplay(yearMonth).entrySet();
+		users = plugin.getPreviousMonthsTopVoters().get(yearMonth).entrySet();
 
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteTopName());
 		inv.addPlaceholder("topvoter", yearMonth.toString());

VotingPlugin/src/main/java/com/bencodez/votingplugin/commands/gui/player/VoteURL.java

@@ -177,7 +177,7 @@ public class VoteURL extends GUIHandler {
 		}
 
 		if (plugin.getGui().isChestVoteURLBackButton()) {
-			dialog.button("&eBack", "&7Return to previous menu", payload -> plugin.getCommandLoader().performVoteCommand(player, "gui"));
+			dialog.button("&eBack", "&7Return to previous menu", payload -> player.performCommand("vote gui"));
 		}
 
 		dialog.open();

VotingPlugin/src/main/java/com/bencodez/votingplugin/config/Config.java

@@ -24,6 +24,9 @@ import com.bencodez.votingplugin.topvoter.TopVoter;
 import lombok.Getter;
 
 public class Config extends YMLFile {
+	/** Opt-in persistent vanilla voting NPCs; missing configuration preserves legacy behavior. */
+	public boolean isVotingNPCsEnabled() { return getData().getBoolean("VotingNPCs.Enabled", false); }
+
 
 	/** Explicit permission for executable deployment over private-network plaintext HTTP. */
 	public boolean getControlAllowInsecureHttpPluginDeployment() {
@@ -522,15 +525,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean limitMonthlyVotes = false;
 
-	/** Restart-only player command registration. Missing keys preserve /vote. */
-	@ConfigDataBoolean(path = "VoteCommandEnabled", defaultValue = true)
-	@Getter
-	private boolean voteCommandEnabled = true;
-
-	@ConfigDataString(path = "VoteCommandName", defaultValue = "vote")
-	@Getter
-	private String voteCommandName = "vote";
-
 	@ConfigDataBoolean(path = "LoadCommandAliases")
 	@Getter
 	private boolean loadCommandAliases = true;
@@ -809,10 +803,6 @@ public class Config extends YMLFile {
 	@Getter
 	private boolean topVoterAwardsTies = true;
 
-	@ConfigDataBoolean(path = "HideTopVoterIfNotPlayedBefore")
-	@Getter
-	private boolean hideTopVoterIfNotPlayedBefore = false;
-
 	@ConfigDataBoolean(path = "TopVoterIgnorePermission")
 	@Getter
 	private boolean topVoterIgnorePermission = false;

VotingPlugin/src/main/java/com/bencodez/votingplugin/config/GUI.java

@@ -26,10 +26,6 @@ import lombok.Getter;
  */
 public class GUI extends YMLFile {
 
-	@ConfigDataString(path = "CHEST.VoteStreaks.Name")
-	@Getter
-	private String chestVoteStreaksName = "&6Vote streaks";
-
 	@ConfigDataString(path = "BOOK.VoteURLBookGUI.AlreadyVotedColor")
 	@Getter
 	private String bookVoteURLBookGUIAlreadyVotedColor = "RED";

VotingPlugin/src/main/java/com/bencodez/votingplugin/cooldown/CoolDownCheck.java

@@ -11,13 +11,10 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 
-import com.bencodez.advancedcore.api.rewards.Reward;
 import com.bencodez.advancedcore.api.rewards.RewardOptions;
 import com.bencodez.advancedcore.api.user.AdvancedCoreUser;
 import com.bencodez.advancedcore.api.user.UserDataFetchMode;
@@ -39,14 +36,12 @@ public class CoolDownCheck implements Listener {
 	private final VotingPluginMain plugin;
 
 	private final Map<UUID, ScheduledFuture<?>> perSiteTasks = new ConcurrentHashMap<>();
-	private final Map<UUID, Object> perSiteGenerations = new ConcurrentHashMap<>();
 	private final Map<UUID, ScheduledFuture<?>> allSiteTasks = new ConcurrentHashMap<>();
 
 	@Getter
 	private final ScheduledExecutorService timer;
 
 	private volatile boolean cooldownCheckEnabled = false;
-	private volatile boolean stopped = false;
 
 	/**
 	 * Constructs a new cooldown check manager.
@@ -79,8 +74,6 @@ public class CoolDownCheck implements Listener {
 	 * Shuts down the cooldown check timer.
 	 */
 	public void shutdown() {
-		stopped = true;
-		perSiteGenerations.clear();
 		timer.shutdownNow();
 
 		for (ScheduledFuture<?> f : perSiteTasks.values()) {
@@ -154,7 +147,6 @@ public class CoolDownCheck implements Listener {
 					user.updateTempCacheWithColumns(cols);
 					cols.clear(); // help GC (only useful if reused)
 				}
-				capturePlayerName(user);
 
 				checkPerSite(site, user);
 			} finally {
@@ -227,20 +219,13 @@ public class CoolDownCheck implements Listener {
 	 * Site-specific version used by batch checks / checkAllVoteSite.
 	 */
 	private void checkPerSite(VoteSite site, VotingPluginUser user) {
-		checkPerSite(site, user, null);
-	}
-
-	private HashMap<String, Boolean> checkPerSite(VoteSite site, VotingPluginUser user,
-			HashMap<String, Boolean> coolDownChecks) {
 		if (!plugin.getConfigFile().isPerSiteCoolDownEvents() || site == null) {
-			return coolDownChecks;
+			return;
 		}
 
-		if (coolDownChecks == null) {
-			coolDownChecks = user.getCoolDownCheckSiteList();
-		}
+		HashMap<String, Boolean> coolDownChecks = user.getCoolDownCheckSiteList();
 		if (Boolean.TRUE.equals(coolDownChecks.get(site.getKey()))) {
-			return coolDownChecks;
+			return;
 		}
 
 		if (user.canVoteSite(site)) {
@@ -252,7 +237,6 @@ public class CoolDownCheck implements Listener {
 			PlayerVoteSiteCoolDownEndEvent event = new PlayerVoteSiteCoolDownEndEvent(user, site);
 			plugin.getServer().getPluginManager().callEvent(event);
 		}
-		return coolDownChecks;
 	}
 
 	/**
@@ -283,8 +267,8 @@ public class CoolDownCheck implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onCoolDownEnd(PlayerVoteCoolDownEndEvent event) {
-		dispatchCooldownReward(event.getPlayer(), plugin.getSpecialRewardsConfig().getData(),
-				"VoteCoolDownEndedReward", "all", new RewardOptions());
+		plugin.getRewardHandler().giveReward(event.getPlayer(), plugin.getSpecialRewardsConfig().getData(),
+				"VoteCoolDownEndedReward", new RewardOptions());
 	}
 
 	/**
@@ -294,73 +278,11 @@ public class CoolDownCheck implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
 	public void onCoolDownEnd(PlayerVoteSiteCoolDownEndEvent event) {
-		dispatchCooldownReward(event.getPlayer(), event.getSite().getSiteData(), "CoolDownEndRewards",
-				"site:" + event.getSite().getKey(), new RewardOptions()
-						.addPlaceholder("sitename", event.getSite().getDisplayName())
+		plugin.getRewardHandler().giveReward(event.getPlayer(), event.getSite().getSiteData(), "CoolDownEndRewards",
+				new RewardOptions().addPlaceholder("sitename", event.getSite().getDisplayName())
 						.addPlaceholder("url", event.getSite().getVoteURL(false)));
 	}
 
-	private void dispatchCooldownReward(VotingPluginUser user, ConfigurationSection data, String path,
-			String site, RewardOptions options) {
-		boolean configured = false;
-		try {
-			configured = hasConfiguredCooldownReward(data, path);
-		} catch (RuntimeException ignored) {
-			// Preserve legacy dispatch even when diagnostic configuration inspection fails.
-		}
-		if (!configured) {
-			plugin.getRewardHandler().giveReward(user, data, path, options);
-			return;
-		}
-		String occurrence = UUID.randomUUID().toString();
-		String player = user.getUUID();
-		String safeSite = String.valueOf(site).replaceAll("[\\r\\n\\p{Cntrl}]", "?");
-		long time = System.currentTimeMillis();
-		String context = " occurrence=" + occurrence + " player=" + player + " site=" + safeSite + " time=" + time;
-		logCooldownDiagnostic(false, "Cooldown reward status=attempted" + context);
-		options.setAsyncFailureObserver(failure -> logCooldownFailure(context, failure));
-		try {
-			plugin.getRewardHandler().giveReward(user, data, path, options);
-		} catch (RuntimeException | Error failure) {
-			logCooldownFailure(context, failure);
-			throw failure;
-		}
-	}
-
-	private boolean hasConfiguredCooldownReward(ConfigurationSection data, String path) {
-		if (data == null) return false;
-		if (data instanceof FileConfiguration) {
-			return plugin.getRewardHandler().hasRewards((FileConfiguration) data, path);
-		}
-		if (data.isList(path)) return !data.getList(path, new ArrayList<>()).isEmpty();
-		if (data.isConfigurationSection(path)) return !data.getConfigurationSection(path).getKeys(false).isEmpty();
-		return data.isString(path) && !data.getString(path, "").isEmpty();
-	}
-
-	private void logCooldownFailure(String context, Throwable failure) {
-		int completed = -1;
-		Throwable current = failure;
-		for (int depth = 0; current != null && depth < 32; depth++, current = current.getCause()) {
-			if (current instanceof Reward.RewardReplayFailure) {
-				completed = ((Reward.RewardReplayFailure) current).getCompletedInjectionCount();
-				break;
-			}
-		}
-		String error = failure == null ? "unknown" : failure.getClass().getSimpleName();
-		logCooldownDiagnostic(true, "Cooldown reward outcome=unknown/partial" + context + " error=" + error
-				+ " completedInjections=" + (completed < 0 ? "unknown" : completed)
-				+ "; inspect effects before reissuing");
-	}
-
-	private void logCooldownDiagnostic(boolean warning, String message) {
-		try {
-			if (warning) plugin.getLogger().warning(message);
-			else plugin.getLogger().info(message);
-		} catch (RuntimeException ignored) {
-			// A broken logger must not suppress or retry the reward.
-		}
-	}
-
 	/**
 	 * Schedules a cooldown check for a user.
 	 *
@@ -402,7 +324,7 @@ public class CoolDownCheck implements Listener {
 	 * @param force whether to force the schedule
 	 */
 	public void schedulePerSite(VotingPluginUser user, boolean force) {
-		if (stopped || !plugin.getConfigFile().isPerSiteCoolDownEvents()) {
+		if (!plugin.getConfigFile().isPerSiteCoolDownEvents()) {
 			return;
 		}
 
@@ -411,7 +333,6 @@ public class CoolDownCheck implements Listener {
 		}
 
 		final UUID uuid = user.getJavaUUID();
-		final String scheduledName = user.getPlayerName();
 
 		final NextSite next = user.getNextSiteAvailable();
 
@@ -419,13 +340,8 @@ public class CoolDownCheck implements Listener {
 			if (existing != null) {
 				existing.cancel(false);
 			}
-			if (stopped) {
-				perSiteGenerations.remove(uuid);
-				return null;
-			}
 
 			if (next == null || next.getSite() == null || next.getSecondsUntilAvailable() <= 0) {
-				perSiteGenerations.remove(uuid);
 				plugin.extraDebug(user.getUUID() + "/" + user.getPlayerName() + " not scheduling per-site cooldown check");
 				return null; // remove entry
 			}
@@ -433,58 +349,19 @@ public class CoolDownCheck implements Listener {
 			plugin.devDebug("PerSiteCoolDownEvent schedule: site=" + next.getSite().getKey() + " time="
 					+ next.getSecondsUntilAvailable() + " seconds");
 
-			Object generation = new Object();
-			perSiteGenerations.put(uuid, generation);
-			try {
-				return timer.schedule(() -> runPerSiteTimer(uuid, scheduledName, next, generation, 0),
-						next.getSecondsUntilAvailable() + 2, TimeUnit.SECONDS);
-			} catch (RuntimeException | Error failure) {
-				perSiteGenerations.remove(uuid, generation);
-				throw failure;
-			}
-		});
-	}
-
-
-	private void runPerSiteTimer(UUID uuid, String scheduledName, NextSite next, Object generation, int retries) {
-		if (stopped || !plugin.isEnabled() || perSiteGenerations.get(uuid) != generation) return;
-		UUID occurrence = UUID.randomUUID();
-		boolean[] retried = { false };
-		try {
-			VotingPluginUser current;
-			try {
-				// The batch user's temporary row may have been cleared or replaced by a newer vote.
-				current = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid, false);
-				if (!current.isCached()) current.userDataFetechMode(UserDataFetchMode.NO_CACHE);
-				String storedName = current.getData().getString("PlayerName", current.getUserDataFetchMode());
-				String name = storedName != null && !storedName.isBlank() ? storedName : scheduledName;
-				if (name != null && !name.isBlank()) current.setPlayerName(name);
-			} catch (RuntimeException refreshFailure) {
-				if (retries < 3) {
-					perSiteTasks.compute(uuid, (key, existing) -> {
-						if (stopped || !plugin.isEnabled() || perSiteGenerations.get(uuid) != generation) return existing;
-						ScheduledFuture<?> retry = timer.schedule(
-								() -> runPerSiteTimer(uuid, scheduledName, next, generation, retries + 1),
-								30, TimeUnit.SECONDS);
-						retried[0] = true;
-						return retry;
-					});
-					if (retried[0]) return;
+			return timer.schedule(() -> {
+				if (!plugin.isEnabled()) {
+					return;
 				}
-				throw refreshFailure;
-			}
-			if (perSiteGenerations.get(uuid) != generation) return;
-			checkPerSite(next.getSite(), current);
-			if (perSiteGenerations.get(uuid) == generation) schedulePerSite(current, false);
-		} catch (RuntimeException | Error failure) {
-			String siteKey = String.valueOf(next.getSite().getKey()).replaceAll("[\\r\\n\\p{Cntrl}]", "?");
-			logCooldownDiagnostic(true, "Cooldown timer failed: occurrence=" + occurrence + " player=" + uuid
-					+ " site=" + siteKey + " time=" + System.currentTimeMillis() + " error="
-					+ failure.getClass().getSimpleName() + "; reward outcome is uncertain; inspect effects before reissuing");
-			throw failure;
-		} finally {
-			if (!retried[0]) perSiteGenerations.remove(uuid, generation);
-		}
+
+				// Only check the next site; this will set the cooldown-end flag + fire event if ready
+				checkPerSite(next.getSite(), user);
+
+				// Schedule the following site (if any)
+				schedulePerSite(user, false);
+
+			}, next.getSecondsUntilAvailable() + 2, TimeUnit.SECONDS);
+		});
 	}
 
 	/**
@@ -504,14 +381,6 @@ public class CoolDownCheck implements Listener {
 		}
 	}
 
-	/** Preserve the name needed by asynchronous rewards after the temporary row is cleared. */
-	private static void capturePlayerName(VotingPluginUser user) {
-		String name = user.getPlayerName();
-		if (name != null && !name.isBlank()) {
-			user.setPlayerName(name);
-		}
-	}
-
 	/**
 	 * Performance-optimized: scan users ONCE, process all daily-delay sites.
 	 */
@@ -552,11 +421,9 @@ public class CoolDownCheck implements Listener {
 					user.updateTempCacheWithColumns(cols);
 					cols.clear();
 				}
-				capturePlayerName(user);
 
-				HashMap<String, Boolean> coolDownChecks = null;
 				for (int i = 0; i < dailySites.size(); i++) {
-					coolDownChecks = checkPerSite(dailySites.get(i), user, coolDownChecks);
+					checkPerSite(dailySites.get(i), user);
 				}
 
 				check(user);

VotingPlugin/src/main/java/com/bencodez/votingplugin/core/datemilestones/DateVoteEvent.java

@@ -1,64 +0,0 @@
-package com.bencodez.votingplugin.core.datemilestones;
-
-import java.nio.charset.StandardCharsets;
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.security.MessageDigest;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.HexFormat;
-import java.util.List;
-import java.util.Set;
-
-/** Immutable owner-defined event accounting contract; display text is not identity. */
-public record DateVoteEvent(String id, String displayName, boolean enabled, long start, long end,
-        String timezone, List<Integer> thresholds, Set<String> sites, String accountingServer) {
-    public DateVoteEvent {
-        if (id == null || !id.matches("[A-Za-z0-9_-]{1,64}")) throw new IllegalArgumentException("Invalid event ID");
-        if (start <= 0 || end <= start) throw new IllegalArgumentException("End must be after start");
-        ZoneId.of(timezone);
-        if (thresholds.isEmpty() || thresholds.size() > 64 || thresholds.stream().anyMatch(n -> n <= 0 || n > 4096)
-                || thresholds.stream().distinct().count() != thresholds.size()) throw new IllegalArgumentException("Invalid thresholds (1–4096, unique, max 64)");
-        thresholds = thresholds.stream().sorted().toList();
-        if (sites.size() > 100 || sites.stream().anyMatch(s -> s == null || s.length() > 128 || s.isBlank()))
-            throw new IllegalArgumentException("Invalid site filters");
-        sites = Set.copyOf(sites);
-        if (accountingServer == null || accountingServer.length() > 128) throw new IllegalArgumentException("Invalid accounting server");
-        if (displayName == null || displayName.length() > 256) throw new IllegalArgumentException("Invalid display name");
-    }
-    public boolean matches(long occurredAt, String site, boolean real, boolean proxy, String server) {
-        return enabled && real && occurredAt >= start && occurredAt < end && (sites.isEmpty() || sites.contains(site))
-                && (!proxy || !accountingServer.isBlank() && accountingServer.equals(server));
-    }
-    public String fingerprint() {
-        try {
-            var bytes = new ByteArrayOutputStream();
-            try (var data = new DataOutputStream(bytes)) {
-                data.writeLong(start); data.writeLong(end); data.writeUTF(timezone);
-                data.writeInt(thresholds.size());
-                for (int threshold : thresholds) data.writeInt(threshold);
-                data.writeInt(sites.size());
-                for (String site : sites.stream().sorted().toList()) data.writeUTF(site);
-                data.writeUTF(accountingServer);
-            }
-            return hash(bytes.toByteArray());
-        } catch (java.io.IOException impossible) { throw new IllegalStateException(impossible); }
-    }
-    /** Portable case-sensitive identity, including on case-insensitive filesystems. */
-    public String fileId() { return fileId(id); }
-    public static String fileId(String id) {
-        if (id == null || !id.matches("[A-Za-z0-9_-]{1,64}")) throw new IllegalArgumentException("Invalid event ID");
-        return hash(id.getBytes(StandardCharsets.UTF_8));
-    }
-    private static String hash(byte[] bytes) {
-        try { return HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256").digest(bytes)); }
-        catch (java.security.NoSuchAlgorithmException impossible) { throw new IllegalStateException(impossible); }
-    }
-    public static long timestamp(String localIso, String timezone) {
-        LocalDateTime time = LocalDateTime.parse(localIso);
-        ZoneId zone = ZoneId.of(timezone);
-        if (zone.getRules().getValidOffsets(time).size() != 1)
-            throw new IllegalArgumentException("Ambiguous/nonexistent local time; choose an unambiguous boundary");
-        return time.atZone(zone).toInstant().toEpochMilli();
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/core/datemilestones/DateVoteProgressSnapshot.java

@@ -1,36 +0,0 @@
-package com.bencodez.votingplugin.core.datemilestones;
-
-import java.util.List;
-import java.util.OptionalInt;
-import java.util.Set;
-
-/** Immutable worker result; viewing this snapshot never mutates accounting or rewards. */
-public record DateVoteProgressSnapshot(long capturedAt, List<Event> events) {
-    public DateVoteProgressSnapshot { events = List.copyOf(events); }
-    public enum Availability { OWNED, REMOTE, UNAVAILABLE }
-    public record Milestone(int threshold, String id, boolean enabled, List<String> rewardTypes) {
-        public Milestone { rewardTypes = List.copyOf(rewardTypes); }
-    }
-    public record Event(DateVoteEvent definition, Availability availability, int votes,
-            Set<Integer> submitted, Set<Integer> deferred, Set<Integer> reserved, List<Milestone> milestones) {
-        public Event {
-            submitted = Set.copyOf(submitted); deferred = Set.copyOf(deferred); reserved = Set.copyOf(reserved);
-            milestones = List.copyOf(milestones);
-        }
-        public String status(long now) {
-            return !definition.enabled() ? "disabled" : now < definition.start() ? "upcoming"
-                    : now >= definition.end() ? "ended" : "active";
-        }
-        public OptionalInt nextThreshold() {
-            return availability == Availability.OWNED ? milestones.stream().filter(m -> m.enabled() && m.threshold() > votes)
-                    .mapToInt(Milestone::threshold).min() : OptionalInt.empty();
-        }
-        public String awardState(int threshold) {
-            if (availability != Availability.OWNED) return "progress unavailable";
-            if (reserved.contains(threshold)) return "pending review";
-            if (submitted.contains(threshold)) return "submitted";
-            if (deferred.contains(threshold)) return "deferred";
-            return votes >= threshold ? "reached" : "not reached";
-        }
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/core/maintenance/AutoCreateVoteSitesReminderState.java

@@ -1,127 +0,0 @@
-package com.bencodez.votingplugin.core.maintenance;
-
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Cumulative active-runtime clock for the owner-facing auto-create setup reminder.
- * This class performs no persistence or notification. One owned worker must
- * serialize the entire propose, persist, commit, then notify sequence, including
- * reload and shutdown checkpoints. Method synchronization alone does not serialize
- * the external persistence step. Only notify after a successful commit.
- *
- * <p>Reconstruct this state from its durable snapshot and a fresh monotonic clock
- * reading on startup; never persist the process-local clock anchor. Samples must
- * be less than {@link Long#MAX_VALUE} nanoseconds apart (the normal nanoTime elapsed
- * time contract). Negative clock readings and signed clock wrap are supported.
- */
-public final class AutoCreateVoteSitesReminderState {
-
-	public static final long NEVER_REMINDED = -1;
-	/** The first reminder is emitted on the first active checkpoint. */
-	public static final long DEFAULT_THRESHOLD_MILLIS = 0;
-	/** Subsequent reminders are bounded to one every 48 active hours. */
-	public static final long DEFAULT_REPEAT_MILLIS = TimeUnit.HOURS.toMillis(48);
-	public static final long MAX_INTERVAL_MILLIS = Long.MAX_VALUE / 1_000_000;
-	private static final long NANOS_PER_MILLI = 1_000_000;
-
-	/** Immutable durable data; a reminder marker must refer to accrued runtime. */
-	public record Snapshot(long totalRuntimeMillis, long lastReminderRuntimeMillis) {
-		public Snapshot {
-			if (totalRuntimeMillis < 0 || lastReminderRuntimeMillis < NEVER_REMINDED
-					|| lastReminderRuntimeMillis > totalRuntimeMillis) {
-				throw new IllegalArgumentException("Invalid reminder runtime snapshot");
-			}
-		}
-	}
-
-	/**
-	 * A tentative checkpoint, valid only until this state commits any candidate.
-	 * Persist {@link #snapshot()} before committing; discard on a failed write and
-	 * propose again. Creating or discarding candidates changes no committed state.
-	 */
-	public static final class Candidate {
-		private final Object epoch;
-		private final Snapshot snapshot;
-		private final long checkpointNanos;
-		private final boolean reminderDue;
-
-		private Candidate(Object epoch, Snapshot snapshot, long checkpointNanos, boolean reminderDue) {
-			this.epoch = epoch;
-			this.snapshot = snapshot;
-			this.checkpointNanos = checkpointNanos;
-			this.reminderDue = reminderDue;
-		}
-
-		public Snapshot snapshot() {
-			return snapshot;
-		}
-
-		public boolean reminderDue() {
-			return reminderDue;
-		}
-	}
-
-	private Snapshot snapshot;
-	private long checkpointNanos;
-	private Object epoch = new Object();
-
-	public AutoCreateVoteSitesReminderState(Snapshot snapshot, long nowNanos) {
-		this.snapshot = Objects.requireNonNull(snapshot, "snapshot");
-		this.checkpointNanos = nowNanos;
-	}
-
-	public synchronized Snapshot snapshot() {
-		return snapshot;
-	}
-
-	/**
-	 * Accrue runtime regardless of either flag. Both flags are required to propose a
-	 * reminder, at the inclusive threshold or repeat boundary. Settings are sampled
-	 * for each proposal; changing them does not reset accumulated runtime or markers.
-	 * Backward samples accrue nothing and leave the clock anchor unchanged.
-	 */
-	public synchronized Candidate propose(long nowNanos, boolean reminderEnabled, boolean autoCreateEnabled,
-			long thresholdMillis, long repeatMillis) {
-		validateInterval(thresholdMillis);
-		validateInterval(repeatMillis);
-		if (repeatMillis == 0) {
-			throw new IllegalArgumentException("Reminder repeat interval must be positive");
-		}
-		long elapsedNanos = nowNanos - checkpointNanos;
-		long elapsedMillis = elapsedNanos > 0 ? elapsedNanos / NANOS_PER_MILLI : 0;
-		long total = saturatingAdd(snapshot.totalRuntimeMillis(), elapsedMillis);
-		long lastReminder = snapshot.lastReminderRuntimeMillis();
-		boolean due = reminderEnabled && autoCreateEnabled && total >= thresholdMillis
-				&& (lastReminder == NEVER_REMINDED || total - lastReminder >= repeatMillis);
-		Snapshot next = new Snapshot(total, due ? total : lastReminder);
-		// Consume only whole milliseconds so frequent checkpoints do not lose time.
-		long nextCheckpoint = checkpointNanos + elapsedMillis * NANOS_PER_MILLI;
-		return new Candidate(epoch, next, nextCheckpoint, due);
-	}
-
-	/**
-	 * Publish a checkpoint only after its durable write succeeded. A successful
-	 * commit invalidates every other candidate from that epoch, including this one.
-	 * Foreign, stale, or duplicate candidates are rejected without changing state.
-	 */
-	public synchronized void commit(Candidate candidate) {
-		Objects.requireNonNull(candidate, "candidate");
-		if (candidate.epoch != epoch) {
-			throw new IllegalArgumentException("Candidate is not current for this reminder state");
-		}
-		snapshot = candidate.snapshot;
-		checkpointNanos = candidate.checkpointNanos;
-		epoch = new Object();
-	}
-
-	private static void validateInterval(long millis) {
-		if (millis < 0 || millis > MAX_INTERVAL_MILLIS) {
-			throw new IllegalArgumentException("Reminder interval is outside the supported range");
-		}
-	}
-
-	private static long saturatingAdd(long total, long elapsed) {
-		return elapsed > Long.MAX_VALUE - total ? Long.MAX_VALUE : total + elapsed;
-	}
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/core/vote/SharedVoteProcessor.java

@@ -1,5 +1,7 @@
 package com.bencodez.votingplugin.core.vote;
 
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.UUID;
 
 /** The accepted vote sequence. Platform operations are supplied by the receiving adapter. */
@@ -65,15 +67,12 @@ public final class SharedVoteProcessor {
         boolean forceProxyRouting();
         boolean wasOnline();
         boolean realVote();
-        default long currentTimeMillis() { return System.currentTimeMillis(); }
         boolean addTotals();
         boolean broadcastEnabled();
         boolean hasBroadcastHandler();
         void broadcast(UUID uuid, String name, String siteDisplayName, boolean online);
         boolean hasProxyTextTotals();
         UUID proxyVoteId();
-        /** Local receipt identity, without implying proxy provenance. */
-        default UUID localOccurrenceId() { return null; }
         default boolean identifiedQueuedProxyVote() { return false; }
         default boolean proxyQueueClassificationKnown() { return false; }
         default boolean proxyDelayValidationKnown() { return false; }
@@ -106,7 +105,6 @@ public final class SharedVoteProcessor {
         int enabledSiteCount();
         void setMonthTotal(U user, int total);
         void milestones(U user, UUID voteId, boolean forceProxyRouting);
-        default void dateMilestones(U user, S site, long voteTime, UUID voteId) { }
         void cooldown(U user, S site);
         void voteStreak(U user, long voteTime, UUID voteId);
         void postVote(S site, U user, String playerName, long voteTime, UUID voteId, boolean cached);
@@ -188,8 +186,10 @@ public final class SharedVoteProcessor {
                     + (legacyRecordedProxyVote ? "; legacy timestamp matches LastVotes: " + ops.incomingTime()
                             : "; stable vote ID identifies this queued delivery: " + ops.proxyVoteId()));
         }
-        UUID voteId = ops.proxyVote() ? ops.proxyVoteId() : ops.localOccurrenceId();
-        if (voteId == null) voteId = UUID.randomUUID();
+        UUID voteId = UUID.randomUUID();
+        if (ops.proxyVote() && ops.proxyVoteId() != null) {
+            voteId = ops.proxyVoteId();
+        }
         String userId = ops.userId(user);
         ops.cache(user);
         ops.updateName(user);
@@ -217,7 +217,7 @@ public final class SharedVoteProcessor {
             voteTime = ops.incomingTime();
         } else {
             ops.setTimeNow(user, site);
-            voteTime = ops.currentTimeMillis();
+            voteTime = LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
         }
         boolean cached = false;
         if (SharedVoteDelivery.shouldDeliverNow(ops::proxyVote, () -> ops.userOnline(user),
@@ -251,7 +251,6 @@ public final class SharedVoteProcessor {
             }
         }
         ops.milestones(user, voteId, ops.forceProxyRouting());
-        ops.dateMilestones(user, site, voteTime, voteId);
         ops.cooldown(user, site);
         ops.voteStreak(user, voteTime, voteId);
         ops.postVote(site, user, playerName, voteTime, voteId, cached);

VotingPlugin/src/main/java/com/bencodez/votingplugin/data/GenerationFencedServerDataFile.java

@@ -1,247 +0,0 @@
-package com.bencodez.votingplugin.data;
-
-import java.io.File;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
-
-import org.bukkit.configuration.file.FileConfiguration;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.plugin.Plugin;
-
-import com.bencodez.advancedcore.api.time.TimeType;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.util.ServerDataPublicationFence;
-
-/**
- * Routes SDK publications through this generation's ownership lease. The SDK's
- * original file/configuration remains authoritative; no YAML snapshot is copied.
- */
-public final class GenerationFencedServerDataFile extends com.bencodez.advancedcore.data.ServerData {
-    private final com.bencodez.advancedcore.data.ServerData delegate;
-    private final ServerDataPublicationFence fence;
-    private final VotingPluginMain ownerPlugin;
-
-    public GenerationFencedServerDataFile(VotingPluginMain plugin,
-            com.bencodez.advancedcore.data.ServerData delegate, ServerDataPublicationFence fence) {
-        super(plugin);
-        this.ownerPlugin = java.util.Objects.requireNonNull(plugin);
-        this.delegate = java.util.Objects.requireNonNull(delegate);
-        this.fence = java.util.Objects.requireNonNull(fence);
-    }
-
-    public boolean wraps(com.bencodez.advancedcore.data.ServerData file) { return delegate == file; }
-
-    public boolean belongsTo(ServerDataPublicationFence owner) { return fence == owner; }
-
-    /** Checkpoint callers use the same monitor as native final publication. */
-    @Override public Object publicationMonitor() {
-        return java.util.Objects.requireNonNull(delegate.publicationMonitor(), "Server-data publication monitor");
-    }
-
-    private void withOwner(Runnable operation) {
-        try (var lease = fence.acquire()) {
-            synchronized (publicationMonitor()) {
-                try { operation.run(); }
-                catch (RuntimeException | Error failure) {
-                    try { refreshVotePartyDisplay(); }
-                    catch (RuntimeException | Error observationFailure) {
-                        if (observationFailure != failure) failure.addSuppressed(observationFailure);
-                    }
-                    throw failure;
-                }
-                refreshVotePartyDisplay();
-            }
-        }
-    }
-
-    private <T> T withOwnedValue(Supplier<T> operation) {
-        try (var lease = fence.acquire()) {
-            synchronized (publicationMonitor()) { return operation.get(); }
-        }
-    }
-
-    @Override public FileConfiguration getData() { return delegate.getData(); }
-    @Override public File getdFile() { return delegate.getdFile(); }
-    @Override public JavaPlugin getPlugin() { return delegate.getPlugin(); }
-    @Override public boolean isJustCreated() { return delegate.isJustCreated(); }
-    @Override public boolean isFailedToRead() { return delegate.isFailedToRead(); }
-    @Override public boolean isIgnoreCase() { return delegate.isIgnoreCase(); }
-    @Override public void setIgnoreCase(boolean value) {
-        withOwner(() -> delegate.setIgnoreCase(value));
-    }
-    @Override public void createSection(String path) {
-        mutateOrdinaryData(data -> data.createSection(path));
-    }
-    @Override public void setData(FileConfiguration data) {
-        withOwner(() -> delegate.setData(data));
-    }
-    @Override public void setValue(String path, Object value) {
-        mutateOrdinaryData(data -> data.set(path, value));
-    }
-    @Override public void onFileCreation() {
-        withOwner(delegate::onFileCreation);
-    }
-
-    @Override public void setup() {
-        withOwner(delegate::setup);
-    }
-    @Override public void loadValues() {
-        withOwner(delegate::loadValues);
-    }
-    @Override public void reloadData() {
-        withOwner(delegate::reloadData);
-    }
-    private void refreshVotePartyDisplay() {
-        var wrapper = ownerPlugin.getServerData();
-        if (wrapper != null) {
-            synchronized (publicationMonitor()) {
-                if (delegate.getData() != null) wrapper.refreshVotePartyDisplay();
-            }
-        }
-    }
-
-    @Override public void saveData() {
-        withOwner(() -> {
-            refreshVotePartyDisplay();
-            delegate.saveData();
-        });
-    }
-    @Override public void saveDataChecked() {
-        withOwner(() -> {
-            refreshVotePartyDisplay();
-            delegate.saveDataChecked();
-        });
-    }
-    @Override protected void saveTimeChangeTransitionData() { saveDataChecked(); }
-
-    @Override public void mutateOrdinaryData(Consumer<FileConfiguration> mutation) {
-        // Delegate admission, live mutation and saving to the actual SDK owner.
-        // The projection is published inside that owner's callback before I/O.
-        withOwner(() -> delegate.mutateOrdinaryData(data -> applyOwnedMutation(mutation, data)));
-    }
-
-    private void refreshIfLiveMutation(FileConfiguration data) {
-        var wrapper = ownerPlugin.getServerData();
-        if (wrapper == null) return;
-        synchronized (publicationMonitor()) {
-            // Native final publication mutates a staged candidate first. Legacy
-            // adapters may instead mutate the live owner before their save.
-            if (data == delegate.getData()) wrapper.refreshVotePartyDisplay();
-        }
-    }
-
-    private void applyOwnedMutation(Consumer<FileConfiguration> mutation, FileConfiguration data) {
-        try { mutation.accept(data); }
-        catch (RuntimeException | Error failure) {
-            try { refreshIfLiveMutation(data); }
-            catch (RuntimeException | Error observationFailure) {
-                if (observationFailure != failure) failure.addSuppressed(observationFailure);
-            }
-            throw failure;
-        }
-        refreshIfLiveMutation(data);
-    }
-
-    private void finishFinalPublication(ServerDataPublicationFence.Lease lease,
-            CompletableFuture<Void> result, Throwable failure) {
-        Throwable outcome = failure;
-        try {
-            // Partial startup may have no display wrapper. In that case, do not
-            // introduce a YAML-observation dependency into final-stage drain.
-            refreshVotePartyDisplay();
-        } catch (Throwable observationFailure) {
-            if (outcome == null) outcome = observationFailure;
-            else if (outcome != observationFailure) outcome.addSuppressed(observationFailure);
-        }
-        // Refresh observes only the actual live owner; it never acknowledges a
-        // failed/cancelled publication or releases its retained generation.
-        if (outcome != null) { result.completeExceptionally(outcome); return; }
-        try { lease.close(); result.complete(null); }
-        catch (Throwable releaseFailure) { result.completeExceptionally(releaseFailure); }
-    }
-
-    /** Retain this handle only for retries of the same accepted mutation. */
-    FinalPublication prepareFinalPublication(Consumer<FileConfiguration> mutation) {
-        return new FinalPublication(mutation);
-    }
-
-    final class FinalPublication {
-        private final Consumer<FileConfiguration> mutation;
-        private ServerDataPublicationFence.Lease lease;
-        private CompletableFuture<Void> attempt;
-        private boolean publicationConfirmed;
-
-        private FinalPublication(Consumer<FileConfiguration> mutation) { this.mutation = mutation; }
-
-        CompletionStage<Void> publish() {
-            CompletableFuture<Void> result;
-            ServerDataPublicationFence.Lease owner;
-            boolean refreshOnly;
-            synchronized (this) {
-                if (attempt != null && !attempt.isCompletedExceptionally())
-                    return attempt.minimalCompletionStage();
-                if (lease == null) {
-                    try { lease = fence.acquire(); }
-                    catch (Throwable failure) { return CompletableFuture.failedFuture(failure); }
-                }
-                owner = lease;
-                result = new CompletableFuture<>();
-                attempt = result;
-                refreshOnly = publicationConfirmed;
-            }
-            // No operation lock is held across the actual owner's YAML or I/O.
-            if (refreshOnly) finish(owner, result, null);
-            else {
-                try {
-                    java.util.Objects.requireNonNull(mutation, "mutation");
-                    java.util.Objects.requireNonNull(delegate.mutateFinalData(data -> applyOwnedMutation(mutation, data)))
-                            .whenComplete((ignored, failure) -> finish(owner, result, failure));
-                } catch (Throwable failure) { finish(owner, result, failure); }
-            }
-            return result.minimalCompletionStage();
-        }
-
-        private void finish(ServerDataPublicationFence.Lease owner,
-                CompletableFuture<Void> result, Throwable failure) {
-            if (failure == null) {
-                synchronized (this) { publicationConfirmed = true; }
-            }
-            // A retry after a display-observation failure must not repeat a
-            // confirmed mutation. Failed publication instead retains this one
-            // lease until this same operation has a confirmed successful retry.
-            finishFinalPublication(owner, result, failure);
-        }
-    }
-
-    @Override public CompletionStage<Void> mutateFinalData(Consumer<FileConfiguration> mutation) {
-        // Ordinary one-shot callers retain failed ownership conservatively.
-        // A caller with an explicit retry contract retains the operation handle.
-        return prepareFinalPublication(mutation).publish();
-    }
-
-    @Override public void setData(String path, Object value) { mutateOrdinaryData(data -> data.set(path, value)); }
-    @Override public void setIgnoreTime(boolean value) { withOwner(() -> delegate.setIgnoreTime(value)); }
-    @Override public void setLastUpdated() { withOwner(delegate::setLastUpdated); }
-    @Override public void setPluginVersion(Plugin plugin) { withOwner(() -> delegate.setPluginVersion(plugin)); }
-    @Override public void setPrevDay(int value) { withOwner(() -> delegate.setPrevDay(value)); }
-    @Override public void setPrevMonth(String value) { withOwner(() -> delegate.setPrevMonth(value)); }
-    @Override public void setPrevWeekDay(int value) { withOwner(() -> delegate.setPrevWeekDay(value)); }
-
-    @Override public TimeChangeTransitionState beginTimeChangeTransition(TimeType type, String period, String marker) {
-        return withOwnedValue(() -> delegate.beginTimeChangeTransition(type, period, marker));
-    }
-    @Override public TimeChangeTransitionState getPendingTimeChangeTransition(TimeType type) {
-        return withOwnedValue(() -> delegate.getPendingTimeChangeTransition(type));
-    }
-    @Override public void completeTimeChangeTransition(TimeChangeTransitionState transition) {
-        withOwner(() -> delegate.completeTimeChangeTransition(transition));
-    }
-    @Override public void failTimeChangeTransition(TimeChangeTransitionState transition) {
-        withOwner(() -> delegate.failTimeChangeTransition(transition));
-    }
-    @Override public boolean isPendingTimeChangeTransition(TimeChangeTransitionState transition) {
-        return withOwnedValue(() -> delegate.isPendingTimeChangeTransition(transition));
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/data/ServerData.java

@@ -18,182 +18,9 @@ import com.bencodez.votingplugin.signs.SignHandler;
 import com.bencodez.votingplugin.timequeue.VoteTimeQueue;
 import com.bencodez.votingplugin.topvoter.TopVoter;
 
-public class ServerData {
-
-	/** Immutable live display values, separate from durable publication acknowledgement. */
-	public record VotePartyDisplay(int total, int extraRequired) {
-		public int required(int configured) { return extraRequired > 0 ? configured + extraRequired : configured; }
-		public int needed(int configured) { return required(configured) - total; }
-	}
-
-	private volatile VotePartyDisplay votePartyDisplay = new VotePartyDisplay(0, 0);
-
-	/** Snapshot-only: never acquires a YAML owner or waits for filesystem publication. */
-	public VotePartyDisplay getVotePartyDisplay() { return votePartyDisplay; }
-
-	/** Called during startup before placeholders are registered. */
-	public void refreshVotePartyDisplay() { mutateData(this::captureVotePartyDisplay); }
-
-	private void captureVotePartyDisplay() {
-		var data = getFile().getData().getConfigurationSection("VotingPlugin");
-		votePartyDisplay = data == null ? new VotePartyDisplay(0, 0)
-				: new VotePartyDisplay(data.getInt("VoteParty.Total"), data.getInt("VotePartyExtraRequired"));
-	}
+public class ServerData {
 
 	private VotingPluginMain plugin = VotingPluginMain.plugin;
-	private volatile com.bencodez.advancedcore.data.ServerData generationFile;
-	private final Object generationBinding = new Object();
-	private volatile com.bencodez.votingplugin.util.ServerDataPublicationFence generationFence;
-
-	private com.bencodez.advancedcore.data.ServerData getFile() {
-		var current = generationFile;
-		if (current != null) return current;
-		synchronized (generationBinding) {
-			if (generationFile == null) {
-				var owner = getPublicationFence();
-				// Reject an old lazy wrapper before exposing successor mutable state.
-				try (var lease = owner == null ? null : owner.acquire()) {
-					var file = plugin.getServerDataFile();
-					if (file instanceof GenerationFencedServerDataFile guarded && !guarded.belongsTo(owner))
-						throw new IllegalStateException("Server-data file belongs to another generation");
-					generationFile = file;
-				}
-			}
-			return generationFile;
-		}
-	}
-
-
-
-	private record SignCoordinates(String world, int x, int y, int z) {
-		static SignCoordinates capture(Location location) {
-			return new SignCoordinates(location.getWorld().getName(), (int) location.getX(),
-					(int) location.getY(), (int) location.getZ());
-		}
-		void store(ConfigurationSection data, String path) {
-			data.set(path + ".World", world);
-			data.set(path + ".X", x);
-			data.set(path + ".Y", y);
-			data.set(path + ".Z", z);
-		}
-	}
-
-
-    /** Detached shutdown payload: no platform object is accessed by its publisher. */
-    public static final class SignSnapshot {
-        private final String count;
-        private final SignCoordinates location;
-        private final SignCoordinates skull;
-        private final String data;
-        private final int position;
-
-        private SignSnapshot(String count, Location location, Location skull, String data, int position) {
-            this.count = count;
-            this.location = SignCoordinates.capture(location);
-            this.skull = skull == null ? null : SignCoordinates.capture(skull);
-            this.data = data;
-            this.position = position;
-        }
-
-        private void store(ConfigurationSection target) {
-            location.store(target, "Signs." + count);
-            target.set("Signs." + count + ".Data", data);
-            target.set("Signs." + count + ".Position", position);
-            if (skull != null) skull.store(target, "Signs." + count + ".Skull");
-        }
-    }
-
-    public static SignSnapshot captureSignSnapshot(String count, Location location, Location skull,
-            String data, int position) {
-        return new SignSnapshot(count, location, skull, data, position);
-    }
-
-    private record ShutdownSignPublication(List<SignSnapshot> snapshot,
-            java.util.function.Supplier<java.util.concurrent.CompletionStage<Void>> publisher) { }
-    private final Object shutdownSignBinding = new Object();
-    private ShutdownSignPublication shutdownSignPublication;
-
-    /** Worker-only: one accepted sign batch, with the same publication owner across retries. */
-    public java.util.concurrent.CompletionStage<Void> publishShutdownSigns(List<SignSnapshot> signs) {
-        var snapshot = List.copyOf(signs);
-        ShutdownSignPublication publication;
-        synchronized (shutdownSignBinding) {
-            if (shutdownSignPublication == null) {
-                var file = getFile();
-                java.util.function.Consumer<org.bukkit.configuration.file.FileConfiguration> mutation = candidate -> {
-                    var target = candidate.getConfigurationSection("VotingPlugin");
-                    if (target == null) target = candidate.createSection("VotingPlugin");
-                    for (var sign : snapshot) sign.store(target);
-                };
-                java.util.function.Supplier<java.util.concurrent.CompletionStage<Void>> publisher;
-                if (file instanceof GenerationFencedServerDataFile guarded) {
-                    var retained = guarded.prepareFinalPublication(mutation);
-                    publisher = retained::publish;
-                } else publisher = () -> file.mutateFinalData(mutation);
-                shutdownSignPublication = new ShutdownSignPublication(snapshot, publisher);
-            } else if (!shutdownSignPublication.snapshot().equals(snapshot)) {
-                return java.util.concurrent.CompletableFuture.failedFuture(
-                        new IllegalStateException("Shutdown sign publication already owns a different batch"));
-            }
-            publication = shutdownSignPublication;
-        }
-        return publication.publisher().get();
-    }
-
-	/** Only YAML work belongs here; platform callbacks run outside the file owner. */
-	private void mutateData(Runnable mutation) {
-		var fence = getPublicationFence();
-		try (var owner = fence == null ? null : fence.acquire()) {
-			synchronized (publicationMonitor()) {
-				mutation.run();
-			}
-		}
-	}
-
-	/** Admit the complete ordinary mutation before changing live YAML or its display. */
-	private void mutateSavedData(Runnable mutation) {
-		mutateData(() -> getFile().mutateOrdinaryData(ignored -> {
-			try { mutation.run(); }
-			catch (RuntimeException | Error failure) {
-				try { captureVotePartyDisplay(); }
-				catch (RuntimeException | Error observationFailure) {
-					if (observationFailure != failure) failure.addSuppressed(observationFailure);
-				}
-				throw failure;
-			}
-			captureVotePartyDisplay();
-		}));
-	}
-
-	/** Store a scalar and save under the same YAML ownership as final SDK snapshots. */
-	public void setInt(String path, int value) {
-		mutateSavedData(() -> {
-			getData().set(path, value);
-		});
-	}
-
-	/** Store a detached string list, preventing later caller mutation of live YAML. */
-	public void setStringList(String path, List<String> values) {
-		var snapshot = values == null ? null : new ArrayList<>(values);
-		mutateSavedData(() -> {
-			getData().set(path, snapshot);
-		});
-	}
-
-	/** All mutations serialize with the actual SDK YAML owner. */
-	private Object publicationMonitor() {
-		var file = getFile();
-		return java.util.Objects.requireNonNull(file.publicationMonitor(), "Server-data publication monitor");
-	}
-
-	private com.bencodez.votingplugin.util.ServerDataPublicationFence getPublicationFence() {
-		var current = generationFence;
-		if (current != null) return current;
-		synchronized (generationBinding) {
-			if (generationFence == null) generationFence = plugin.getServerDataPublicationFence();
-			return generationFence;
-		}
-	}
 
 	/**
 	 * Constructs a new ServerData.
@@ -202,7 +29,6 @@ public class ServerData {
 	 */
 	public ServerData(VotingPluginMain plugin) {
 		this.plugin = plugin;
-		this.generationFence = plugin.getServerDataPublicationFence();
 	}
 
 	/**
@@ -210,15 +36,13 @@ public class ServerData {
 	 *
 	 * @param placeholder the placeholder to add
 	 */
-	public void addAutoCachedPlaceholder(String placeholder) {
-		mutateData(() -> {
-			List<String> p = getAutoCachedPlaceholder();
-
-			if (!ArrayUtils.containsIgnoreCase(p, placeholder)) {
-				p.add(placeholder);
-				setAutoCachedPlaceholder(p);
-			}
-		});
+	public void addAutoCachedPlaceholder(String placeholder) {
+		List<String> p = getAutoCachedPlaceholder();
+
+		if (!ArrayUtils.containsIgnoreCase(p, placeholder)) {
+			p.add(placeholder);
+			setAutoCachedPlaceholder(p);
+		}
 	}
 
 	/**
@@ -226,14 +50,12 @@ public class ServerData {
 	 *
 	 * @param site the service site to add
 	 */
-	public void addServiceSite(String site) {
-		mutateData(() -> {
-			ArrayList<String> l = getServiceSites();
-			if (!getServiceSites().contains(site)) {
-				l.add(site);
-			}
-			setServiceSites(ArrayUtils.removeDuplicates(l));
-		});
+	public synchronized void addServiceSite(String site) {
+		ArrayList<String> l = getServiceSites();
+		if (!getServiceSites().contains(site)) {
+			l.add(site);
+		}
+		setServiceSites(ArrayUtils.removeDuplicates(l));
 	}
 
 	/**
@@ -243,20 +65,19 @@ public class ServerData {
 	 * @param data     the data
 	 * @param position the position
 	 */
-	public void addSign(Location location, String data, int position) {
-		var coordinates = new SignCoordinates(location.getWorld().getName(), location.getBlockX(),
-				location.getBlockY(), location.getBlockZ());
-		int[] selected = new int[1];
-		mutateSavedData(() -> {
-			int count = nextSignNumber();
-			selected[0] = count;
-			coordinates.store(getData(), "Signs." + count);
-			getData().set("Signs." + count + ".Data", data);
-			getData().set("Signs." + count + ".Position", position);
-		});
-		String count = Integer.toString(selected[0]);
-		plugin.getSigns().getSigns().add(new SignHandler(plugin, count, getSignLocation(count),
-				getSignSkullLocation(count), getSignData(count), getSignPosition(count)));
+	public void addSign(Location location, String data, int position) {
+
+		int count = nextSignNumber();
+
+		getData().set("Signs." + count + ".World", location.getWorld().getName());
+		getData().set("Signs." + count + ".X", location.getBlockX());
+		getData().set("Signs." + count + ".Y", location.getBlockY());
+		getData().set("Signs." + count + ".Z", location.getBlockZ());
+		getData().set("Signs." + count + ".Data", data);
+		getData().set("Signs." + count + ".Position", position);
+		saveData();
+		plugin.getSigns().getSigns().add(new SignHandler(plugin, "" + count, getSignLocation("" + count),
+				getSignSkullLocation("" + count), getSignData("" + count), getSignPosition("" + count)));
 	}
 
 	/**
@@ -266,14 +87,10 @@ public class ServerData {
 	 * @param vote the vote time queue entry
 	 */
 	public void addTimeVoted(int num, VoteTimeQueue vote) {
-		mutateData(() -> {
-			getData().set("TimedVoteCache." + num + ".Name", vote.getName());
-			getData().set("TimedVoteCache." + num + ".Service", vote.getService());
-			getData().set("TimedVoteCache." + num + ".Time", vote.getTime());
-			getData().set("TimedVoteCache." + num + ".LocalOccurrenceId", vote.getLocalOccurrenceId() == null ? null : vote.getLocalOccurrenceId().toString());
-			getData().set("TimedVoteCache." + num + ".CanonicalOccurrenceTime", vote.getCanonicalOccurrenceTime() == 0L ? null : vote.getCanonicalOccurrenceTime());
-			saveTimedVoteCache();
-		});
+		getData().set("TimedVoteCache." + num + ".Name", vote.getName());
+		getData().set("TimedVoteCache." + num + ".Service", vote.getService());
+		getData().set("TimedVoteCache." + num + ".Time", vote.getTime());
+		saveData();
 	}
 
 	/**
@@ -281,28 +98,16 @@ public class ServerData {
 	 *
 	 * @param ident the vote shop identifier
 	 */
-	public void addVoteShopPurchase(String ident) {
-		mutateData(() -> {
-			setVoteShopPurchases(ident, (getVoteShopPurchases(ident) + 1));
-		});
+	public void addVoteShopPurchase(String ident) {
+		setVoteShopPurchases(ident, (getVoteShopPurchases(ident) + 1));
 	}
 
-    /** Assign a legacy local cache row its identity before replay is scheduled. */
-    public void setTimedVoteLocalOccurrenceId(String key, UUID occurrenceId) {
-        mutateData(() -> {
-            getData().set("TimedVoteCache." + key + ".LocalOccurrenceId", occurrenceId.toString());
-            saveTimedVoteCache();
-        });
-    }
-
 	/**
 	 * Clears the timed vote cache.
 	 */
-	public void clearTimedVoteCache() {
-		mutateData(() -> {
-			getData().set("TimedVoteCache", null);
-			saveTimedVoteCache();
-		});
+	public void clearTimedVoteCache() {
+		getData().set("TimedVoteCache", null);
+		saveData();
 	}
 
 	/**
@@ -337,15 +142,13 @@ public class ServerData {
 	 *
 	 * @return the data
 	 */
-	public ConfigurationSection getData() {
-		var fence = getPublicationFence();
-		try (var owner = fence == null ? null : fence.acquire()) {
-			synchronized (publicationMonitor()) {
-				ConfigurationSection data = getFile().getData().getConfigurationSection("VotingPlugin");
-				if (data == null) data = getFile().getData().createSection("VotingPlugin");
-				return data;
-			}
-		}
+	public ConfigurationSection getData() {
+		ConfigurationSection data = plugin.getServerDataFile().getData().getConfigurationSection("VotingPlugin");
+		if (data == null) {
+			plugin.getServerDataFile().getData().createSection("VotingPlugin");
+			data = plugin.getServerDataFile().getData().getConfigurationSection("VotingPlugin");
+		}
+		return data;
 	}
 
 	/**
@@ -362,10 +165,9 @@ public class ServerData {
 	 *
 	 * @return the service sites
 	 */
-	public ArrayList<String> getServiceSites() {
-		synchronized (publicationMonitor()) {
-			return new ArrayList<>(getData().getStringList("GottenServiceSites"));
-		}
+	@SuppressWarnings("unchecked")
+	public ArrayList<String> getServiceSites() {
+		return (ArrayList<String>) getData().getList("GottenServiceSites", new ArrayList<>());
 	}
 
 	/**
@@ -374,11 +176,9 @@ public class ServerData {
 	 *
 	 * @return persisted service-site observations
 	 */
-	public List<String> getServiceSitesReadOnly() {
-		synchronized (publicationMonitor()) {
-			ConfigurationSection root = getFile().getData().getConfigurationSection("VotingPlugin");
-			return root == null ? List.of() : List.copyOf(root.getStringList("GottenServiceSites"));
-		}
+	public synchronized List<String> getServiceSitesReadOnly() {
+		ConfigurationSection root = plugin.getServerDataFile().getData().getConfigurationSection("VotingPlugin");
+		return root == null ? List.of() : List.copyOf(root.getStringList("GottenServiceSites"));
 	}
 
 	/**
@@ -539,11 +339,8 @@ public class ServerData {
 	/**
 	 * Reload data.
 	 */
-	public void reloadData() {
-		mutateData(() -> {
-			getFile().reloadData();
-			captureVotePartyDisplay();
-		});
+	public void reloadData() {
+		plugin.getServerDataFile().reloadData();
 	}
 
 	/**
@@ -562,168 +359,36 @@ public class ServerData {
 	 * @param top the top voter type
 	 * @param messageId the message ID
 	 */
-	public void setTopVoterMessageId(TopVoter top, long messageId) {
-		mutateSavedData(() -> {
-			getData().set("DiscordSRV.TopVoterMessageId." + top.toString(), messageId);
-		});
+	public void setTopVoterMessageId(TopVoter top, long messageId) {
+		getData().set("DiscordSRV.TopVoterMessageId." + top.toString(), messageId);
+		saveData();
 	}
 
-	/**
-	 * Uses the existing writer and confirms this ID in the saved file. Legacy void saves may
-	 * swallow I/O failure; queued/custom writers may also remain unconfirmed at this point.
-	 * False is an uncertain outcome, never permission to delete a possibly recorded message.
-	 * Call only on the existing worker, under this facade's normal save ordering.
-	 */
-	public synchronized boolean setTopVoterMessageIdConfirmed(TopVoter top, long messageId) {
-		setTopVoterMessageId(top, messageId);
-		try {
-			var saved = new org.bukkit.configuration.file.YamlConfiguration();
-			saved.load(plugin.getServerDataFile().getdFile());
-			return saved.getLong("VotingPlugin.DiscordSRV.TopVoterMessageId." + top.toString(), 0) == messageId;
-		} catch (java.io.IOException | org.bukkit.configuration.InvalidConfigurationException | RuntimeException failure) {
-			return false;
-		}
-	}
-
-	/**
+	/**
 	 * Removes the sign.
 	 *
 	 * @param sign the sign
 	 */
-	public void removeSign(String sign) {
-		mutateSavedData(() -> {
-			getData().set("Signs." + sign + ".World", null);
-			getData().set("Signs." + sign + ".X", null);
-			getData().set("Signs." + sign + ".Y", null);
-			getData().set("Signs." + sign + ".Z", null);
-			getData().set("Signs." + sign + ".Data", null);
-			getData().set("Signs." + sign + ".Position", null);
-			getData().set("Signs." + sign, null);
-			getData().set("Signs." + sign + ".Skull.World", null);
-			getData().set("Signs." + sign + ".Skull.X", null);
-			getData().set("Signs." + sign + ".Skull.Y", null);
-			getData().set("Signs." + sign + ".Skull.Z", null);
-		});
+	public void removeSign(String sign) {
+		getData().set("Signs." + sign + ".World", null);
+		getData().set("Signs." + sign + ".X", null);
+		getData().set("Signs." + sign + ".Y", null);
+		getData().set("Signs." + sign + ".Z", null);
+		getData().set("Signs." + sign + ".Data", null);
+		getData().set("Signs." + sign + ".Position", null);
+		getData().set("Signs." + sign, null);
+		getData().set("Signs." + sign + ".Skull.World", null);
+		getData().set("Signs." + sign + ".Skull.X", null);
+		getData().set("Signs." + sign + ".Skull.Y", null);
+		getData().set("Signs." + sign + ".Skull.Z", null);
+		saveData();
 	}
 
-	/** Checkpoint the pending suffix without retiring its live queue entries. */
-	public void replaceTimedVoteCache(java.util.Collection<VoteTimeQueue> pending) {
-		mutateData(() -> {
-			Object previous = getData().get("TimedVoteCache");
-			try {
-				setTimedVoteCache(pending);
-				saveTimedVoteCache();
-			} catch (RuntimeException | Error failure) {
-				getData().set("TimedVoteCache", previous);
-				throw failure;
-			}
-		});
-	}
-
-	/** Publish the recovery suffix and conservative in-flight record in one file save. */
-	public void prepareTimedVoteDispatch(UUID id, VoteTimeQueue vote,
-			java.util.Collection<VoteTimeQueue> pending) {
-		mutateData(() -> {
-			String path = "UncertainTimedVotes." + id;
-			Object previousCache = getData().get("TimedVoteCache");
-			Object previousRecord = getData().get(path);
-			try {
-				setTimedVoteCache(pending);
-				getData().set(path, null);
-				getData().createSection(path, timedVoteFields(vote));
-				saveTimedVoteCache();
-			} catch (RuntimeException | Error failure) {
-				getData().set("TimedVoteCache", previousCache);
-				getData().set(path, previousRecord);
-				throw failure;
-			}
-		});
-	}
-
-	/** Restore an undispatched occurrence and its pending suffix for ordinary restart recovery. */
-	public void abortTimedVoteDispatch(UUID id, java.util.Collection<VoteTimeQueue> pending) {
-		mutateData(() -> {
-			String path = "UncertainTimedVotes." + id;
-			Object previousCache = getData().get("TimedVoteCache");
-			Object previousRecord = getData().get(path);
-			try {
-				setTimedVoteCache(pending);
-				getData().set(path, null);
-				saveTimedVoteCache();
-			} catch (RuntimeException | Error failure) {
-				getData().set("TimedVoteCache", previousCache);
-				getData().set(path, previousRecord);
-				throw failure;
-			}
-		});
-	}
-
-	/** Clear only a confirmed dispatch record; failed writes retain its live representation. */
-	public void completeTimedVoteDispatch(UUID id) {
-		mutateData(() -> {
-			String path = "UncertainTimedVotes." + id;
-			Object previous = getData().get(path);
-			try {
-				getData().set(path, null);
-				saveTimedVoteCache();
-			} catch (RuntimeException | Error failure) {
-				getData().set(path, previous);
-				throw failure;
-			}
-		});
-	}
-
-	private void setTimedVoteCache(java.util.Collection<VoteTimeQueue> pending) {
-		java.util.Map<String, Object> rows = new java.util.LinkedHashMap<>();
-		int index = 0;
-		for (VoteTimeQueue vote : pending) rows.put(Integer.toString(index++), timedVoteFields(vote));
-		getData().set("TimedVoteCache", null);
-		getData().createSection("TimedVoteCache", rows);
-	}
-
-	private static java.util.Map<String, Object> timedVoteFields(VoteTimeQueue vote) {
-		java.util.Map<String, Object> fields = new java.util.LinkedHashMap<>();
-		fields.put("Name", vote.getName());
-		fields.put("Service", vote.getService());
-		fields.put("Time", vote.getTime());
-		if (vote.getLocalOccurrenceId() != null) fields.put("LocalOccurrenceId", vote.getLocalOccurrenceId().toString());
-		if (vote.getCanonicalOccurrenceTime() != 0L) fields.put("CanonicalOccurrenceTime", vote.getCanonicalOccurrenceTime());
-		return fields;
-	}
-
-	/** Retain an ambiguous event delivery without making it eligible for automatic replay. */
-	public void addUncertainTimedVote(java.util.UUID id, VoteTimeQueue vote) {
-		mutateData(() -> {
-			String path = "UncertainTimedVotes." + id;
-			getData().set(path + ".Name", vote.getName());
-			getData().set(path + ".Service", vote.getService());
-			getData().set(path + ".Time", vote.getTime());
-			getData().set(path + ".LocalOccurrenceId", vote.getLocalOccurrenceId() == null ? null : vote.getLocalOccurrenceId().toString());
-			getData().set(path + ".CanonicalOccurrenceTime", vote.getCanonicalOccurrenceTime() == 0L ? null : vote.getCanonicalOccurrenceTime());
-			saveTimedVoteCache();
-		});
-	}
-
-	/** Timed votes must observe write failures before their in-memory queue is retired. */
-	private void saveTimedVoteCache() {
-		var fence = getPublicationFence();
-		try (var owner = fence == null ? null : fence.acquire()) {
-			var file = getFile();
-			if (file instanceof GenerationFencedServerDataFile guarded) guarded.saveDataChecked();
-			else file.getData().save(file.getdFile());
-		} catch (java.io.IOException failure) {
-			throw new java.io.UncheckedIOException("Failed to save timed vote cache", failure);
-		}
-	}
-
-	/** Saves server data through the existing general-purpose file helper. */
-	public void saveData() {
-		mutateData(() -> {
-			// Publish the complete live display projection before entering disk I/O.
-			// A failed save still does not acknowledge durable storage.
-			captureVotePartyDisplay();
-			getFile().saveData();
-		});
+	/**
+	 * Save data.
+	 */
+	public synchronized void saveData() {
+		plugin.getServerDataFile().saveData();
 	}
 
 	/**
@@ -731,10 +396,13 @@ public class ServerData {
 	 *
 	 * @param disabledReminders the list of UUIDs with disabled reminders
 	 */
-	public void saveDisabledReminders(ArrayList<UUID> disabledReminders) {
-		ArrayList<String> uuids = new ArrayList<>();
-		for (UUID uuid : disabledReminders) uuids.add(uuid.toString());
-		setStringList("DisabledReminders", uuids);
+	public void saveDisabledReminders(ArrayList<UUID> disabledReminders) {
+		ArrayList<String> uuids = new ArrayList<>();
+		for (UUID uuid : disabledReminders) {
+			uuids.add(uuid.toString());
+		}
+		getData().set("DisabledReminders", uuids);
+		saveData();
 	}
 
 	/**
@@ -742,8 +410,9 @@ public class ServerData {
 	 *
 	 * @param placeholders the list of placeholders
 	 */
-	public void setAutoCachedPlaceholder(List<String> placeholders) {
-		setStringList("AutoCachePlaceholders", placeholders);
+	public void setAutoCachedPlaceholder(List<String> placeholders) {
+		getData().set("AutoCachePlaceholders", placeholders);
+		saveData();
 	}
 
 	/**
@@ -751,8 +420,9 @@ public class ServerData {
 	 *
 	 * @param current the current vote count
 	 */
-	public void setBungeeVotePartyCurrent(int current) {
-		setInt("BungeeVotePartyCurrent", current);
+	public void setBungeeVotePartyCurrent(int current) {
+		getData().set("BungeeVotePartyCurrent", current);
+		saveData();
 	}
 
 	/**
@@ -760,8 +430,9 @@ public class ServerData {
 	 *
 	 * @param required the required vote count
 	 */
-	public void setBungeeVotePartyRequired(int required) {
-		setInt("BungeeVotePartyRequired", required);
+	public void setBungeeVotePartyRequired(int required) {
+		getData().set("BungeeVotePartyRequired", required);
+		saveData();
 	}
 
 	/**
@@ -769,8 +440,9 @@ public class ServerData {
 	 *
 	 * @param list the service sites list
 	 */
-	public void setServiceSites(ArrayList<String> list) {
-		setStringList("GottenServiceSites", list);
+	public void setServiceSites(ArrayList<String> list) {
+		getData().set("GottenServiceSites", list);
+		saveData();
 	}
 
 	/**
@@ -778,10 +450,9 @@ public class ServerData {
 	 *
 	 * @param value the converted status
 	 */
-	public void setShopConverted(boolean value) {
-		mutateSavedData(() -> {
-			getData().set("VoteShopConverted", value);
-		});
+	public void setShopConverted(boolean value) {
+		getData().set("VoteShopConverted", value);
+		saveData();
 	}
 
 	/**
@@ -793,15 +464,21 @@ public class ServerData {
 	 * @param data the sign data
 	 * @param position the sign position
 	 */
-	public void setSign(String count, Location location, Location skullLocation, String data, int position) {
-		var coordinates = SignCoordinates.capture(location);
-		var skull = skullLocation == null ? null : SignCoordinates.capture(skullLocation);
-		mutateSavedData(() -> {
-			coordinates.store(getData(), "Signs." + count);
-			getData().set("Signs." + count + ".Data", data);
-			getData().set("Signs." + count + ".Position", position);
-			if (skull != null) skull.store(getData(), "Signs." + count + ".Skull");
-		});
+	public void setSign(String count, Location location, Location skullLocation, String data, int position) {
+
+		getData().set("Signs." + count + ".World", location.getWorld().getName());
+		getData().set("Signs." + count + ".X", (int) location.getX());
+		getData().set("Signs." + count + ".Y", (int) location.getY());
+		getData().set("Signs." + count + ".Z", (int) location.getZ());
+		getData().set("Signs." + count + ".Data", data);
+		getData().set("Signs." + count + ".Position", position);
+		if (skullLocation != null) {
+			getData().set("Signs." + count + ".Skull.World", skullLocation.getWorld().getName());
+			getData().set("Signs." + count + ".Skull.X", (int) skullLocation.getX());
+			getData().set("Signs." + count + ".Skull.Y", (int) skullLocation.getY());
+			getData().set("Signs." + count + ".Skull.Z", (int) skullLocation.getZ());
+		}
+		saveData();
 	}
 
 	/**
@@ -810,20 +487,21 @@ public class ServerData {
 	 * @param count the sign count
 	 * @param skullLocation the skull location
 	 */
-	public void setSkullLocation(String count, Location skullLocation) {
-		if (skullLocation == null) return;
-		var coordinates = SignCoordinates.capture(skullLocation);
-		mutateData(() -> coordinates.store(getData(), "Signs." + count + ".Skull"));
+	public void setSkullLocation(String count, Location skullLocation) {
+		if (skullLocation != null) {
+			getData().set("Signs." + count + ".Skull.World", skullLocation.getWorld().getName());
+			getData().set("Signs." + count + ".Skull.X", (int) skullLocation.getX());
+			getData().set("Signs." + count + ".Skull.Y", (int) skullLocation.getY());
+			getData().set("Signs." + count + ".Skull.Z", (int) skullLocation.getZ());
+		}
 	}
 
 	/**
 	 * Sets the version.
 	 */
-	public void setVersion() {
-		String version = Bukkit.getVersion();
-		mutateSavedData(() -> {
-			getData().set("Version", version);
-		});
+	public void setVersion() {
+		getData().set("Version", Bukkit.getVersion());
+		saveData();
 	}
 
 	/**
@@ -831,10 +509,9 @@ public class ServerData {
 	 *
 	 * @param value the extra required votes
 	 */
-	public void setVotePartyExtraRequired(int value) {
-		mutateSavedData(() -> {
-			getData().set("VotePartyExtraRequired", value);
-		});
+	public void setVotePartyExtraRequired(int value) {
+		getData().set("VotePartyExtraRequired", value);
+		saveData();
 	}
 
 	/**
@@ -843,45 +520,42 @@ public class ServerData {
 	 * @param ident the vote shop identifier
 	 * @param amount the purchase amount
 	 */
-	public void setVoteShopPurchases(String ident, int amount) {
-		mutateSavedData(() -> {
-			getData().set("VoteShopPurchases." + ident, amount);
-		});
+	public void setVoteShopPurchases(String ident, int amount) {
+		getData().set("VoteShopPurchases." + ident, amount);
+		saveData();
 	}
 
 	/**
 	 * Updates the last vote party timestamp to today.
 	 */
-	public void updateLastVoteParty() {
-		int day = plugin.getTimeChecker().getTime().getDayOfYear();
-		setInt("LastVoteParty", day);
+	public void updateLastVoteParty() {
+		getData().set("LastVoteParty", plugin.getTimeChecker().getTime().getDayOfYear());
+		saveData();
 	}
 
 	/**
 	 * Updates the last vote party week timestamp to this week.
 	 */
-	public void updateLastVotePartyWeek() {
-		int week = plugin.getTimeChecker().getTime().get(WeekFields.of(Locale.getDefault()).weekOfYear());
-		setInt("LastVotePartyWeek", week);
+	public void updateLastVotePartyWeek() {
+		getData().set("LastVotePartyWeek",
+				plugin.getTimeChecker().getTime().get(WeekFields.of(Locale.getDefault()).weekOfYear()));
+		saveData();
 	}
 
 	/**
 	 * Updates placeholders to lowercase format.
 	 */
-	public void updatePlaceholders() {
-		mutateData(() -> {
-			boolean data = getData().getBoolean("AutoCacheUpdated", false);
-			if (!data) {
-				mutateSavedData(() -> {
-					List<String> placeholders = getAutoCachedPlaceholder();
-					for (int i = 0; i < placeholders.size(); i++) {
-						placeholders.set(i, placeholders.get(i).toLowerCase());
-					}
-					getData().set("AutoCachePlaceholders", placeholders);
-					getData().set("AutoCacheUpdated", true);
-				});
-			}
-		});
+	public void updatePlaceholders() {
+		boolean data = getData().getBoolean("AutoCacheUpdated", false);
+		if (!data) {
+			List<String> placeholders = getAutoCachedPlaceholder();
+			for (int i = 0; i < placeholders.size(); i++) {
+				placeholders.set(i, placeholders.get(i).toLowerCase());
+			}
+			setAutoCachedPlaceholder(placeholders);
+			getData().set("AutoCacheUpdated", true);
+			saveData();
+		}
 	}
 
 	/**

VotingPlugin/src/main/java/com/bencodez/votingplugin/discord/DiscordHandler.java

@@ -3,8 +3,10 @@ package com.bencodez.votingplugin.discord;
 import java.awt.Color;
 import java.time.Instant;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -25,7 +27,6 @@ import github.scarsz.discordsrv.api.events.DiscordReadyEvent;
 import github.scarsz.discordsrv.dependencies.jda.api.EmbedBuilder;
 import github.scarsz.discordsrv.dependencies.jda.api.JDA;
 import github.scarsz.discordsrv.dependencies.jda.api.entities.TextChannel;
-import github.scarsz.discordsrv.dependencies.jda.api.entities.Message;
 import github.scarsz.discordsrv.dependencies.jda.api.requests.ErrorResponse;
 import github.scarsz.discordsrv.dependencies.jda.api.exceptions.ErrorResponseException;
 import github.scarsz.discordsrv.util.DiscordUtil;
@@ -39,45 +40,8 @@ public class DiscordHandler {
 	private final VotingPluginMain plugin;
 	@Getter
 	private final HashMap<TopVoter, Long> topVoterMessageIds = new HashMap<TopVoter, Long>();
-	/** Identity, rather than generation alone, owns every request and its callbacks. */
-	private static final class Publication {
-		final long generation;
-		final boolean persistent;
-		boolean sending, editing, recovering, again, completing, retired;
-		long requestedGeneration;
-		final AtomicBoolean sendCompleted = new AtomicBoolean(false);
-		Publication(long generation, boolean persistent, boolean sending) {
-			this.generation = generation; this.requestedGeneration = generation;
-			this.persistent = persistent; this.sending = sending; this.editing = !sending;
-		}
-	}
-	private static final int PENDING = 0, WRITING = 1, RETAINED = 2, DISCARDED = 3, DETACHED = 4;
-	private static final int MAX_OWNED_RECEIPTS = 128;
-	/** External success is owned here before any cancellable worker handoff. */
-	private static final class SentReceipt {
-		final TopVoter top;
-		final Message message;
-		final long id;
-		final long generation;
-		final AtomicBoolean cleanupRequested = new AtomicBoolean(false);
-		int state = PENDING;
-		boolean confirmed;
-		SentReceipt(TopVoter top, Message message, long generation) {
-			this.top = top; this.message = message; this.id = message.getIdLong(); this.generation = generation;
-		}
-	}
-	private final java.util.EnumMap<TopVoter, Publication> publications = new java.util.EnumMap<>(TopVoter.class);
-	/** Guarded by publications; includes uncertain saves until confirmed replacement or explicit detachment. */
-	private final java.util.Set<SentReceipt> ownedReceipts = new java.util.HashSet<>();
-	private final AtomicBoolean closed = new AtomicBoolean(false);
+	private final Set<TopVoter> recoveringTopVoters = new HashSet<>();
 	private final AtomicBoolean discordReady = new AtomicBoolean(false);
-	private static final class DisplayUpdate {
-		private final long generation;
-		private long requestedGeneration;
-		private boolean again;
-		private DisplayUpdate(long generation) { this.generation = generation; this.requestedGeneration = generation; }
-	}
-	private final java.util.EnumMap<TopVoter, DisplayUpdate> preparing = new java.util.EnumMap<>(TopVoter.class);
 
 	/**
 	 * Constructs a new Discord handler.
@@ -185,347 +149,14 @@ public class DiscordHandler {
 	 * @param top the top voter
 	 */
 	public void updateTopVoterMessageId(TopVoter top) {
-		prepareTopVoterMessage(top, plugin.getTopVoterDisplayGeneration());
-	}
+		plugin.extraDebug("Updating Discord Top Voter message for: " + top);
 
-	private void prepareTopVoterMessage(TopVoter top, long generation) {
-		DisplayUpdate update;
-		synchronized (preparing) {
-			if (!currentGeneration(generation)) return;
-			DisplayUpdate pending = preparing.get(top);
-			if (pending != null) {
-				pending.again = true;
-				pending.requestedGeneration = generation;
-				return;
-			}
-			update = new DisplayUpdate(generation);
-			preparing.put(top, update);
-		}
-		try {
-			plugin.getTopVoterDisplayAsync(top).whenComplete((snapshot, failure) -> {
-				try {
-					plugin.getTimer().execute(() -> {
-						if (!releasePreparation(top, update)) return;
-						if (!currentGeneration(update.generation)) {
-							retryRequestedPreparation(top, update);
-							return;
-						}
-						// Joins and TTL/scope changes can revoke omissions while publication is queued.
-						// Recheck current evidence without opening another asynchronous deadline.
-						if (update.again || (failure == null && snapshot != null)) {
-							try { publishTopVoterMessage(top, plugin.getTopVoterDisplay(top), update.generation); }
-							catch (RuntimeException unavailable) { warnLeaderboardFailure("preparing a current display for " + top); }
-						} else plugin.getLogger().warning("Unable to prepare Discord Top Voters: " + top);
-					});
-				} catch (RuntimeException rejected) {
-					if (releasePreparation(top, update)) {
-						try { if (currentGeneration(update.generation)) warnLeaderboardFailure("preparation worker admission for " + top); }
-						finally { retryRequestedPreparation(top, update); }
-					}
-				}
-			});
-		} catch (RuntimeException unavailable) {
-			if (releasePreparation(top, update)) {
-				try { if (currentGeneration(update.generation)) warnLeaderboardFailure("preparing evidence for " + top); }
-				finally { retryRequestedPreparation(top, update); }
-			}
-		}
-	}
+		long channelId = plugin.getConfigFile().getDiscordSRVTopVoterChannel(top);
+		LinkedHashMap<TopVoterPlayer, Integer> topVoters = plugin.getTopVoter(top);
 
-	private boolean releasePreparation(TopVoter top, DisplayUpdate update) {
-		synchronized (preparing) { return preparing.remove(top, update); }
-	}
-
-	private void retryRequestedPreparation(TopVoter top, DisplayUpdate update) {
-		// The retired request's evidence never changes ownership to a replacement filter.
-		if (update.again && update.requestedGeneration != update.generation)
-			prepareTopVoterMessage(top, update.requestedGeneration);
-	}
-
-	void publishTopVoterMessage(TopVoter top, LinkedHashMap<TopVoterPlayer, Integer> prepared) {
-		publishTopVoterMessage(top, prepared, plugin.getTopVoterDisplayGeneration());
-	}
-
-	void publishTopVoterMessage(TopVoter top, LinkedHashMap<TopVoterPlayer, Integer> prepared, long generation) {
-		if (!currentGeneration(generation)) return;
+		String title = plugin.getConfigFile().getDiscordSRVTopVoterTitle(top);
 		boolean newMessage = plugin.getConfigFile().isDiscordSRVTopVoterNewMessageOnUpdate(top);
-		TextChannel channel;
-		try { channel = leaderboardChannel(plugin.getConfigFile().getDiscordSRVTopVoterChannel(top)); }
-		catch (RuntimeException unavailable) { warnLeaderboardFailure("channel lookup for " + top); return; }
-		if (channel == null) { warnLeaderboardFailure("missing channel for " + top); return; }
-		Publication publication;
-		long existingId;
-		synchronized (publications) {
-			if (!currentGeneration(generation)) return;
-			Publication pending = publications.get(top);
-			if (pending != null && (pending.editing || (!pending.retired && pending.generation == generation
-					&& (pending.sending || pending.completing)))) {
-				pending.again = true;
-				pending.requestedGeneration = generation;
-				return;
-			}
-			existingId = topVoterMessageIds.getOrDefault(top, 0L);
-			publication = new Publication(generation, !newMessage, existingId <= 0 || newMessage);
-			publications.put(top, publication);
-		}
-		try {
-			var embed = buildTopVoterEmbed(plugin.getConfigFile().getDiscordSRVTopVoterTitle(top), plugin.getTopVoterDisplay(top)).build();
-			if (!current(top, publication)) { finish(top, publication); return; }
-			if (publication.sending) send(top, channel, publication, embed);
-			else channel.editMessageEmbedsById(existingId, embed).queue(
-					message -> finishEdit(top, publication, existingId),
-					error -> handleMessageUpdateFailure(top, channel, publication, error));
-		} catch (RuntimeException unavailable) { failPublication(top, publication, "preparing or submitting a message"); }
-	}
 
-	private boolean current(TopVoter top, Publication publication) {
-		if (!currentGeneration(publication.generation)) return false;
-		synchronized (publications) { return publications.get(top) == publication && !publication.retired; }
-	}
-
-	/** Never hold the publication lock while waiting for the ServerData save monitor. */
-	private boolean persist(TopVoter top, Publication publication, long id) {
-		var data = plugin.getServerData();
-		synchronized (data) {
-			if (!current(top, publication)) return false;
-			data.setTopVoterMessageId(top, id);
-		}
-		return current(top, publication);
-	}
-
-	private void finish(TopVoter top, Publication publication) {
-		boolean again, prepareAgain;
-		long generation;
-		synchronized (publications) {
-			if (publications.get(top) != publication) return;
-			publications.remove(top);
-			again = publication.again;
-			generation = publication.requestedGeneration;
-			prepareAgain = publication.retired || generation != publication.generation;
-		}
-		// A queued request is independent of whether the previous network operation succeeded.
-		if (again) {
-			if (prepareAgain) prepareTopVoterMessage(top, generation);
-			else dispatchLeaderboard(generation,
-					() -> publishTopVoterMessage(top, plugin.getTopVoterDisplay(top), generation), () -> { });
-		}
-	}
-
-	private void warnLeaderboardFailure(String stage) {
-		// Provider exceptions can contain request URLs or message content. Report the phase only.
-		plugin.getLogger().warning("Unable to publish Discord Top Voters (" + stage
-				+ "). Check the Discord channel, permissions and configuration; a later update can retry.");
-	}
-
-	private void failPublication(TopVoter top, Publication publication, String stage) {
-		try { if (current(top, publication)) warnLeaderboardFailure(stage + " for " + top); }
-		finally { finish(top, publication); }
-	}
-
-	private void send(TopVoter top, TextChannel channel, Publication publication,
-			github.scarsz.discordsrv.dependencies.jda.api.entities.MessageEmbed embed) {
-		if (!current(top, publication)) { finish(top, publication); return; }
-		channel.sendMessageEmbeds(embed).queue(message -> {
-			if (!publication.sendCompleted.compareAndSet(false, true)) return;
-			SentReceipt receipt = new SentReceipt(top, message, publication.generation);
-			boolean admitted;
-			synchronized (publications) {
-				admitted = !closed.get() && (!publication.persistent || ownedReceipts.size() < MAX_OWNED_RECEIPTS);
-				if (admitted && publication.persistent) ownedReceipts.add(receipt);
-				publication.completing = true;
-			}
-			if (!admitted) {
-				discardCreatedMessage(publication, receipt); finish(top, publication); return;
-			}
-			dispatchLeaderboard(publication.generation, () -> {
-				try {
-					if (!current(top, publication)) return;
-					if (publication.persistent) { retainCreatedMessage(top, publication, receipt); return; }
-					if (!current(top, publication)) return;
-					synchronized (publications) {
-						if (publications.get(top) == publication) topVoterMessageIds.put(top, receipt.id);
-					}
-				} catch (RuntimeException failure) { warnLeaderboardFailure("storing a message ID for " + top); }
-				finally { discardCreatedMessage(publication, receipt); finish(top, publication); }
-			}, () -> { discardCreatedMessage(publication, receipt); finish(top, publication); });
-		}, failure -> failPublication(top, publication, "sending a message"));
-	}
-
-	/** Retry an uncertain ID save after a successful edit, without creating another external post. */
-	private void finishEdit(TopVoter top, Publication publication, long id) {
-		synchronized (publications) { publication.editing = false; publication.completing = true; }
-		if (!current(top, publication)) { finish(top, publication); return; }
-		SentReceipt retry;
-		synchronized (publications) {
-			retry = ownedReceipts.stream().filter(receipt -> receipt.top == top && receipt.id == id
-					&& receipt.state == RETAINED && !receipt.confirmed).findFirst().orElse(null);
-		}
-		if (retry == null) { finish(top, publication); return; }
-		dispatchLeaderboard(publication.generation, () -> {
-			try { retainCreatedMessage(top, publication, retry); }
-			finally { discardCreatedMessage(publication, retry); finish(top, publication); }
-		}, () -> finish(top, publication));
-	}
-
-	/** Never hold publication ownership while waiting for the existing save monitor or file I/O. */
-	private void retainCreatedMessage(TopVoter top, Publication publication, SentReceipt receipt) {
-		var obsolete = new java.util.ArrayList<SentReceipt>();
-		var data = plugin.getServerData();
-		boolean uncertain = false;
-		synchronized (data) {
-			if (!current(top, publication)) return;
-			synchronized (publications) {
-				if (!current(top, publication) || (receipt.state != PENDING && receipt.state != RETAINED)) return;
-				receipt.state = WRITING;
-			}
-			try {
-				boolean confirmed = data.setTopVoterMessageIdConfirmed(top, receipt.id);
-				long actual = data.getTopVoterMessageId(top);
-				synchronized (publications) {
-					if (receipt.state == DETACHED) return;
-					// A reentrant newer confirmed write already owns the file. Reconcile only this older post.
-					if (actual != receipt.id && ownedReceipts.stream().anyMatch(other -> other != receipt
-							&& other.top == top && other.id == actual && other.state == RETAINED && other.confirmed)) return;
-					receipt.state = RETAINED;
-					receipt.confirmed = confirmed && actual == receipt.id;
-					uncertain = !receipt.confirmed;
-					if (actual == receipt.id && (publications.get(top) == publication
-							|| topVoterMessageIds.getOrDefault(top, 0L) <= 0)) topVoterMessageIds.put(top, receipt.id);
-					if (receipt.confirmed) {
-						var iterator = ownedReceipts.iterator();
-						while (iterator.hasNext()) {
-							SentReceipt previous = iterator.next();
-							if (previous != receipt && previous.top == top && previous.state == RETAINED) {
-								previous.state = DISCARDED; iterator.remove(); obsolete.add(previous);
-							}
-						}
-					}
-				}
-			} catch (RuntimeException failure) {
-				// The legacy writer may have mutated or saved before throwing; do not delete a possibly recorded post.
-				synchronized (publications) {
-					if (receipt.state == DETACHED) return;
-					receipt.state = RETAINED; receipt.confirmed = false;
-					if (publications.get(top) == publication && topVoterMessageIds.getOrDefault(top, 0L) <= 0)
-						topVoterMessageIds.put(top, receipt.id);
-				}
-				uncertain = true;
-			}
-		}
-		obsolete.forEach(this::removeCreatedMessage);
-		if (uncertain) warnMessageStorage();
-	}
-
-	private void discardCreatedMessage(Publication publication, SentReceipt receipt) {
-		if (!publication.persistent) return; // Append mode deliberately keeps its posts.
-		synchronized (publications) {
-			if (receipt.state != PENDING && receipt.state != WRITING) return;
-			receipt.state = DISCARDED; ownedReceipts.remove(receipt);
-		}
-		removeCreatedMessage(receipt);
-	}
-
-	/** Detach the administrator's old posts; clearing an ID never authorizes deleting those posts. */
-	public boolean clearTopVoterMessageId(TopVoter top) {
-		var data = plugin.getServerData();
-		synchronized (data) {
-			synchronized (publications) {
-				publications.remove(top);
-				synchronized (preparing) { preparing.remove(top); }
-				topVoterMessageIds.put(top, 0L);
-				ownedReceipts.removeIf(receipt -> {
-					if (receipt.top != top || (receipt.state != PENDING && receipt.state != RETAINED
-							&& receipt.state != WRITING)) return false;
-					receipt.state = DETACHED; return true;
-				});
-			}
-			try { if (data.setTopVoterMessageIdConfirmed(top, 0L)) return true; }
-			catch (RuntimeException failure) { /* The outgoing diagnostic remains redacted. */ }
-		}
-		warnMessageStorage(); return false;
-	}
-
-	/** Retire invalidated generations before worker cancellation; close invalidates every generation. */
-	public void retireLeaderboardPublications() {
-		var abandoned = new java.util.ArrayList<SentReceipt>();
-		var restart = new java.util.EnumMap<TopVoter, Long>(TopVoter.class);
-		synchronized (publications) {
-			// An admitted edit can still write on Discord after retirement. Keep its
-			// bounded slot until its network callback rather than submitting overlapping edits.
-			publications.entrySet().removeIf(entry -> {
-				Publication publication = entry.getValue();
-				if (currentGeneration(publication.generation) && !publication.retired) return false;
-				boolean again = publication.again && currentGeneration(publication.requestedGeneration);
-				if (!publication.editing) {
-					if (again) restart.put(entry.getKey(), publication.requestedGeneration);
-					return true;
-				}
-				publication.retired = true;
-				publication.again = again;
-				return false;
-			});
-			synchronized (preparing) {
-				preparing.entrySet().removeIf(entry -> {
-					DisplayUpdate update = entry.getValue();
-					if (currentGeneration(update.generation)) return false;
-					if (update.again && currentGeneration(update.requestedGeneration))
-						restart.put(entry.getKey(), update.requestedGeneration);
-					return true;
-				});
-			}
-			var iterator = ownedReceipts.iterator();
-			while (iterator.hasNext()) {
-				SentReceipt receipt = iterator.next();
-				if (receipt.state == PENDING && !currentGeneration(receipt.generation)) {
-					receipt.state = DISCARDED; iterator.remove(); abandoned.add(receipt);
-				}
-			}
-		}
-		abandoned.forEach(this::removeCreatedMessage);
-		// Old worker completions can be cancelled; transfer explicit requests now,
-		// outside both ownership monitors and without waiting for those callbacks.
-		restart.forEach(this::prepareTopVoterMessage);
-	}
-
-	public void close() {
-		synchronized (publications) {
-			if (!closed.compareAndSet(false, true)) return;
-		}
-		retireLeaderboardPublications();
-		boolean uncertain;
-		synchronized (publications) {
-			uncertain = ownedReceipts.stream().anyMatch(receipt -> receipt.state == WRITING || !receipt.confirmed);
-		}
-		if (uncertain) warnMessageStorage();
-	}
-
-	private void warnMessageStorage() {
-		plugin.getLogger().warning("Unable to confirm Discord Top Voters message ID storage. "
-				+ "The post remains tracked in memory; check storage before restarting and reconcile posts manually.");
-	}
-
-	/** JDA owns asynchronous deletion; cleanup does not depend on the retiring plugin worker. */
-	private void removeCreatedMessage(SentReceipt receipt) {
-		if (!receipt.cleanupRequested.compareAndSet(false, true)) return;
-		try {
-			receipt.message.delete().queue(ignored -> { }, failure -> {
-				if (!(failure instanceof ErrorResponseException response)
-						|| response.getErrorResponse() != ErrorResponse.UNKNOWN_MESSAGE) warnMessageCleanup();
-			});
-		} catch (RuntimeException failure) { warnMessageCleanup(); }
-	}
-
-	private void warnMessageCleanup() {
-		plugin.getLogger().warning("Unable to remove an untracked Discord Top Voters message. "
-				+ "Check Discord permissions and remove the unwanted post manually.");
-	}
-
-	TextChannel leaderboardChannel(long channelId) {
-		return DiscordUtil.getJda().getTextChannelById(channelId);
-	}
-
-	/** Render an inspected display snapshot without accessing the Discord runtime. */
-	static EmbedBuilder buildTopVoterEmbed(String title, LinkedHashMap<TopVoterPlayer, Integer> topVoters) {
 		EmbedBuilder eb = new EmbedBuilder().setTitle(title).setColor(Color.CYAN).setTimestamp(Instant.now());
 
 		if (topVoters == null || topVoters.isEmpty()) {
@@ -556,7 +187,34 @@ public class DiscordHandler {
 			eb.setDescription(sb.toString()).setFooter("Top 10 • Updated");
 		}
 
-		return eb;
+		TextChannel channel = DiscordUtil.getJda().getTextChannelById(channelId);
+		if (channel == null) {
+			plugin.getLogger().warning("Discord channel ID " + channelId + " not found: " + top);
+			return;
+		}
+
+		long existingId;
+		synchronized (recoveringTopVoters) {
+			if (recoveringTopVoters.contains(top)) {
+				plugin.debug("Skipping Discord Top Voter update while recovery is in progress: " + top);
+				return;
+			}
+			existingId = topVoterMessageIds.getOrDefault(top, 0L);
+		}
+
+		if (existingId <= 0 || newMessage) {
+			channel.sendMessageEmbeds(eb.build()).queue(msg -> {
+				long newId = msg.getIdLong();
+				topVoterMessageIds.put(top, newId);
+				if (!newMessage)
+					plugin.getServerData().setTopVoterMessageId(top, newId);
+				plugin.debug("Posted new Top Voters " + top + " (ID: " + newId + ")");
+			}, err -> plugin.getLogger().warning("Error sending Top Voters " + top + ": " + err.getMessage()));
+		} else {
+			channel.editMessageEmbedsById(existingId, eb.build()).queue(
+					m -> plugin.debug("Edited Top Voters " + top + " (ID: " + existingId + ")"),
+					err -> handleMessageUpdateFailure(top, channel, eb, existingId, err));
+		}
 	}
 
 	/**
@@ -566,65 +224,41 @@ public class DiscordHandler {
 	 * condition as recoverable so one deleted message cannot permanently stop
 	 * leaderboard updates.
 	 */
-	private boolean currentGeneration(long generation) {
-		return !closed.get() && plugin.isEnabled() && plugin.getTopVoterDisplayGeneration() == generation;
-	}
-
-	private void dispatchLeaderboard(long generation, Runnable action, Runnable discarded) {
-		if (!currentGeneration(generation)) { discarded.run(); return; }
-		try {
-			plugin.getTimer().execute(() -> {
-				try {
-					if (currentGeneration(generation)) action.run(); else discarded.run();
-				} catch (RuntimeException failure) {
-					try { if (currentGeneration(generation)) warnLeaderboardFailure("asynchronous publication"); }
-					finally { discarded.run(); }
-				}
-			});
-		} catch (RuntimeException rejected) {
-			try { if (currentGeneration(generation)) warnLeaderboardFailure("worker admission"); }
-			finally { discarded.run(); }
-		}
-	}
-
-	private void handleMessageUpdateFailure(TopVoter top, TextChannel channel, Publication publication,
+	private void handleMessageUpdateFailure(TopVoter top, TextChannel channel, EmbedBuilder eb, long existingId,
 			Throwable error) {
-		synchronized (publications) { publication.editing = false; }
-		if (!current(top, publication)) { finish(top, publication); return; }
-		if (!plugin.getConfigFile().isDiscordSRVTopVoterAutoRecoverMessageOnFailure()
-				|| !(error instanceof ErrorResponseException response)
-				|| response.getErrorResponse() != ErrorResponse.UNKNOWN_MESSAGE) {
-			failPublication(top, publication, "editing a message");
-			return;
-		}
-		synchronized (publications) {
-			if (publications.get(top) != publication || publication.recovering) return;
-			publication.recovering = true;
-			publication.sending = true;
-		}
-		dispatchLeaderboard(publication.generation, () -> {
-			try {
-				if (!persist(top, publication, 0L)) { finish(top, publication); return; }
-				synchronized (publications) {
-					if (publications.get(top) != publication) return;
-					topVoterMessageIds.put(top, 0L);
-				}
-				// Persistence can block while a join, TTL, reload or disable revokes the earlier frame.
-				var replacement = buildTopVoterEmbed(plugin.getConfigFile().getDiscordSRVTopVoterTitle(top),
-						plugin.getTopVoterDisplay(top)).build();
-				send(top, channel, publication, replacement);
-			} catch (RuntimeException failure) { failPublication(top, publication, "recovering a deleted message"); }
-		}, () -> {
-			// Rejected admission has no effects; the same failed edit may be retried.
-			boolean again = false;
-			synchronized (publications) {
-				if (publications.get(top) == publication) {
-					publication.recovering = false; publication.sending = false;
-					again = publication.again;
+		if (plugin.getConfigFile().isDiscordSRVTopVoterAutoRecoverMessageOnFailure()
+				&& error instanceof ErrorResponseException
+				&& ((ErrorResponseException) error).getErrorResponse() == ErrorResponse.UNKNOWN_MESSAGE) {
+			synchronized (recoveringTopVoters) {
+				if (topVoterMessageIds.getOrDefault(top, 0L) != existingId || !recoveringTopVoters.add(top)) {
+					plugin.debug("Skipping stale Discord Top Voter recovery because another update handled: " + top);
+					return;
 				}
 			}
-			if (again) finish(top, publication);
-		});
+			plugin.getLogger().warning("Discord Top Voters " + top + " message " + existingId
+					+ " no longer exists; clearing the stored ID and posting a replacement.");
+			synchronized (recoveringTopVoters) {
+				topVoterMessageIds.put(top, 0L);
+			}
+			plugin.getServerData().setTopVoterMessageId(top, 0L);
+			channel.sendMessageEmbeds(eb.build()).queue(msg -> {
+				long newId = msg.getIdLong();
+				synchronized (recoveringTopVoters) {
+					topVoterMessageIds.put(top, newId);
+					plugin.getServerData().setTopVoterMessageId(top, newId);
+					recoveringTopVoters.remove(top);
+				}
+				plugin.debug("Recovered Top Voters " + top + " with replacement message (ID: " + newId + ")");
+			}, sendError -> {
+				synchronized (recoveringTopVoters) {
+					recoveringTopVoters.remove(top);
+				}
+				plugin.getLogger().warning("Error recovering Top Voters " + top + ": " + sendError.getMessage());
+			});
+			return;
+		}
+
+		plugin.getLogger().warning("Error editing Top Voters " + top + ": " + error.getMessage());
 	}
 
 	/**

VotingPlugin/src/main/java/com/bencodez/votingplugin/events/PlayerPostVoteEvent.java

@@ -13,11 +13,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 public class PlayerPostVoteEvent extends Event {
-
-	/** Original accepted occurrence time; ordinary cooldown/event time remains separate. */
-	@Getter
-	@Setter
-	private Long canonicalOccurrenceTime;
 
 	/** The Constant handlers. */
 	private static final HandlerList handlers = new HandlerList();
@@ -82,11 +77,6 @@ public class PlayerPostVoteEvent extends Event {
 	@Setter
 	private UUID voteUUID;
 
-	/** Original explicit proxy transport ID; voteUUID retains the legacy correlation fallback. */
-	@Getter
-	@Setter
-	private UUID proxyVoteId;
-
 	/**
 	 * Constructs a new PlayerPostVoteEvent.
 	 *

VotingPlugin/src/main/java/com/bencodez/votingplugin/events/PlayerVoteEvent.java

@@ -19,17 +19,7 @@ import lombok.Setter;
  * <p>Cancellation follows Bukkit's {@code ignoreCancelled} dispatch contract.
  * Integrations must cancel before the MONITOR vote consumer runs.</p>
  */
-public class PlayerVoteEvent extends Event implements Cancellable {
-
-	/** Stable local receipt identity, separate from proxy transport provenance. */
-	@Getter
-	@Setter
-	private UUID localOccurrenceId;
-
-	/** Original accepted occurrence time; ordinary cooldown/event time remains separate. */
-	@Getter
-	@Setter
-	private Long canonicalOccurrenceTime;
+public class PlayerVoteEvent extends Event implements Cancellable {
 
 	/** The Constant handlers. */
 	private static final HandlerList handlers = new HandlerList();
@@ -55,7 +45,7 @@ public class PlayerVoteEvent extends Event implements Cancellable {
 	@Setter
 	private VoteTotalsSnapshot bungeeTextTotals;
 
-	/** Original explicit proxy transport ID; null for legacy totals-only correlation. */
+	/** Stable identity supplied by a proxy delivery, independent of totals. */
 	@Getter
 	@Setter
 	private UUID proxyVoteId;
@@ -96,20 +86,6 @@ public class PlayerVoteEvent extends Event implements Cancellable {
 	@Setter
 	private boolean wasOnline;
 
-    /** Native receipt ownership is released only after the accepted consumer returns. */
-    @Getter
-    @Setter
-    private boolean nativeProcessingStarted;
-
-    @Getter
-    @Setter
-    private boolean nativeProcessingCompleted;
-
-	/** Missing date accounting is surfaced after event dispatch so durable proxy envelopes are not acknowledged. */
-	@Getter
-	@Setter
-	private boolean dateMilestoneAccountingFailed;
-
 	/** Whether this is an identified queued proxy delivery. */
 	@Getter
 	@Setter

VotingPlugin/src/main/java/com/bencodez/votingplugin/listeners/DateVoteMenuOpenGuard.java

@@ -1,18 +0,0 @@
-package com.bencodez.votingplugin.listeners;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryOpenEvent;
-import com.bencodez.advancedcore.api.inventory.GUISession;
-import com.bencodez.votingplugin.commands.gui.player.DateVoteEventsMenu;
-
-/** Fence the actual platform open, including AdvancedCore's additional scheduling handoff. */
-public final class DateVoteMenuOpenGuard implements Listener {
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
-    public void onOpen(InventoryOpenEvent event) {
-        GUISession session = GUISession.extractSession(event.getInventory());
-        if (session != null && !DateVoteEventsMenu.permitsOpen(session.getInventoryGUI(), event.getPlayer()))
-            event.setCancelled(true);
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/listeners/PlayerJoinEvent.java

@@ -35,7 +35,7 @@ public class PlayerJoinEvent implements Listener {
 	public void onPlayerJoin(org.bukkit.event.player.PlayerJoinEvent event) {
 		if (event == null || event.getPlayer() == null) return;
 		Player player = event.getPlayer();
-		plugin.getPlaceholderPlayerPresence().captureOnline(placeholderUuid(player), player);
+		plugin.getPlaceholderPlayerPresence().playerOnline(placeholderUuid(player), player);
 	}
 
 	private UUID placeholderUuid(Player player) {
@@ -83,7 +83,7 @@ public class PlayerJoinEvent implements Listener {
 
 		Player player = event.getPlayer();
 		if (player != null) {
-			if (!plugin.getPlaceholderPlayerPresence().updateStorageUuid(user.getJavaUUID(), player)) return;
+			plugin.getPlaceholderPlayerPresence().playerOnline(user.getJavaUUID(), player);
 		}
 
 		if (player != null && plugin.isYmlError()) {
@@ -160,19 +160,17 @@ public class PlayerJoinEvent implements Listener {
 			plugin.getBackendProxyHandler().playerOffline(player.getName());
 		}
 
-		final UUID serverUuid = player.getUniqueId();
-		final String playerName = player.getName();
 		plugin.getLoginTimer().execute(new Runnable() {
 
 			@Override
 			public void run() {
-				VotingPluginMain.plugin.getAdvancedTab().remove(serverUuid);
+				VotingPluginMain.plugin.getAdvancedTab().remove(player.getUniqueId());
 
 				// Use AdvancedCore UUIDLookup to derive the correct UUID (online/offline aware)
-				String uuid = UuidLookup.getInstance().getUUID(playerName);
+				String uuid = UuidLookup.getInstance().getUUID(player.getName());
 				if (isBlank(uuid)) {
 					// Fallback to online UUID if lookup fails
-					uuid = serverUuid.toString();
+					uuid = player.getUniqueId().toString();
 				}
 
 				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(uuid);

VotingPlugin/src/main/java/com/bencodez/votingplugin/listeners/PlayerVoteListener.java

@@ -35,9 +35,7 @@ public class PlayerVoteListener implements Listener {
         // Keep the production boundary defensive for direct/custom dispatchers
         // as well as Bukkit's Cancellable-aware event dispatcher.
         if (event.isCancelled()) return;
-        BukkitOperations operations = new BukkitOperations(plugin, event);
-        SharedVoteProcessor.process(operations);
-        if (event.isNativeProcessingStarted()) event.setNativeProcessingCompleted(true);
+        SharedVoteProcessor.process(new BukkitOperations(plugin, event));
     }
 
     private static final class BukkitOperations implements SharedVoteProcessor.Operations<VoteSite, VotingPluginUser> {
@@ -49,11 +47,7 @@ public class PlayerVoteListener implements Listener {
             this.event = event;
         }
 
-        @Override public boolean enabled() {
-            boolean enabled = plugin.isEnabled();
-            if (enabled) event.setNativeProcessingStarted(true);
-            return enabled;
-        }
+        @Override public boolean enabled() { return plugin.isEnabled(); }
         @Override public String incomingName() { return event.getPlayer(); }
         @Override public String serviceSite() { return event.getServiceSite(); }
         @Override public void debug(String message) { plugin.debug(message); }
@@ -137,7 +131,6 @@ public class PlayerVoteListener implements Listener {
         }
         @Override public boolean hasProxyTextTotals() { return event.getBungeeTextTotals() != null; }
         @Override public UUID proxyVoteId() { return resolveProxyVoteId(event); }
-        @Override public UUID localOccurrenceId() { return event.getLocalOccurrenceId(); }
         @Override public boolean identifiedQueuedProxyVote() { return event.isQueuedProxyVote(); }
 		@Override public boolean proxyQueueClassificationKnown() { return event.isProxyQueueClassificationKnown(); }
         @Override public boolean proxyDelayValidationKnown() { return event.isProxyDelayValidationKnown(); }
@@ -183,20 +176,6 @@ public class PlayerVoteListener implements Listener {
             plugin.getVoteMilestonesManager().handleVote(user, event.getBungeeTextTotals(), forceProxyRouting,
                     voteId, new HashMap<String, String>());
         }
-        @Override public void dateMilestones(VotingPluginUser user, VoteSite site, long voteTime, UUID voteId) {
-            long occurrenceTime = event.getCanonicalOccurrenceTime() == null
-                    ? proxyVote() ? incomingTime() : voteTime : event.getCanonicalOccurrenceTime();
-            if (com.bencodez.votingplugin.util.BukkitCompletionScheduler.isPlatformOwnedThread()) {
-                // An asynchronous event flag does not identify the thread that dispatched it.
-                // A proxy caller cannot acknowledge accounting that has only been admitted.
-                event.setDateMilestoneAccountingFailed(!plugin.getDateVoteMilestones().deferAccepted(user, site.getKey(), voteId, occurrenceTime,
-                        realVote(), proxyVote(), event.getProxyVoteId() != null && occurrenceTime > 0,
-                        targetedProxyVote(), forceProxyRouting()));
-                return;
-            }
-            if (!plugin.getDateVoteMilestones().accepted(user, site.getKey(), voteId, occurrenceTime, realVote(), proxyVote(),
-                    event.getProxyVoteId() != null && occurrenceTime > 0, targetedProxyVote(), forceProxyRouting())) event.setDateMilestoneAccountingFailed(true);
-        }
         @Override public void cooldown(VotingPluginUser user, VoteSite site) { plugin.getCoolDownCheck().vote(user, site); }
         @Override public void voteStreak(VotingPluginUser user, long voteTime, UUID voteId) {
             plugin.getVoteStreakHandler().processVote(user, voteTime, voteId);
@@ -205,9 +184,6 @@ public class PlayerVoteListener implements Listener {
                 long voteTime, UUID voteId, boolean cached) {
             PlayerPostVoteEvent post = new PlayerPostVoteEvent(site, user, event.isRealVote(), event.isForceBungee(),
                     voteTime, cached, site.getServiceSite(), user.getJavaUUID(), playerName, voteId);
-            post.setProxyVoteId(event.getProxyVoteId());
-            post.setCanonicalOccurrenceTime(event.getCanonicalOccurrenceTime() == null
-                    ? event.isBungee() ? event.getTime() : voteTime : event.getCanonicalOccurrenceTime());
             plugin.getServer().getPluginManager().callEvent(post);
         }
         @Override public boolean placeholderCacheAlways() { return plugin.getConfigFile().getPlaceholderCacheLevel().isCacheAlways(); }

VotingPlugin/src/main/java/com/bencodez/votingplugin/listeners/VotiferEvent.java

@@ -1,9 +1,6 @@
 package com.bencodez.votingplugin.listeners;
 
 import java.util.concurrent.RejectedExecutionException;
-import java.util.UUID;
-import java.util.LinkedHashMap;
-import java.util.Map;
 
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -20,133 +17,16 @@ import com.vexsoftware.votifier.model.VotifierEvent;
 
 public class VotiferEvent implements Listener {
 
-	private final VotingPluginMain plugin;
-    private final java.util.function.BooleanSupplier ready;
-    private volatile boolean accepting = true;
-    private static final int MAX_CAPTURED = VotifierVoteOverflowQueue.MAX_CAPTURED;
-    private boolean retirementQueued;
-    private final Object captureLock = new Object();
-    // Receipt ownership only. Entries leave at completed processing or confirmed
-    // overflow transfer; STARTED work remains owned until then.
-    private final Map<UUID, CapturedVote> captured = new LinkedHashMap<>();
-    private static final class CapturedVote {
-        final String username, site;
-        final long occurredAt;
-        final UUID id;
-        boolean transferring, transferFailureReported;
-        volatile boolean started, completed, finished, transferred;
-        VotifierVoteOverflowQueue recoveryOwner;
-        CapturedVote(String username, String site, long occurredAt, UUID id) {
-            this.username = username; this.site = site; this.occurredAt = occurredAt; this.id = id;
-        }
-    }
+	private VotingPluginMain plugin;
 
 	/**
 	 * Instantiates a new votifer event.
 	 *
 	 * @param plugin the plugin
 	 */
-	public VotiferEvent(VotingPluginMain plugin) { this(plugin, () -> true); }
-
-    public VotiferEvent(VotingPluginMain plugin, java.util.function.BooleanSupplier ready) {
-        this.plugin = plugin; this.ready = ready;
-    }
-    /** Retire admission and reconcile tasks before the vote executor is cancelled. */
-    public void stop() {
-        synchronized (captureLock) {
-            accepting = false;
-            if (retirementQueued) return;
-            retirementQueued = true;
-            var overflow = plugin.getVotifierVoteOverflowQueue();
-            if (overflow == null) {
-                for (CapturedVote vote : java.util.List.copyOf(captured.values())) transferLocked(vote);
-                return;
-            }
-            var snapshot = captured.values().stream().map(vote -> new VotifierVoteOverflowQueue.RetiringCapture(
-                    vote.username, vote.site, vote.occurredAt, vote.id,
-                    () -> !vote.started || vote.finished && !vote.completed, () -> vote.completed,
-                    admitted -> transferred(vote, admitted))).toList();
-            overflow.retireCaptures(snapshot);
-        }
-    }
-
-    public int getPendingCaptureCount() {
-        synchronized (captureLock) { return captured.size(); }
-    }
-
-    private void runCaptured(CapturedVote vote) {
-        synchronized (captureLock) {
-            if (!captured.containsKey(vote.id) || vote.transferring || vote.started) return;
-            if (!accepting || !ready.getAsBoolean()) {
-                if (accepting || !retirementQueued) transferLocked(vote);
-                return;
-            }
-            vote.started = true;
-        }
-        boolean completed = false;
-        try { completed = processCapturedVote(vote.site, vote.username, vote.occurredAt, vote.id)
-                && !Thread.currentThread().isInterrupted(); }
-        finally {
-            VotifierVoteOverflowQueue acknowledge = null;
-            synchronized (captureLock) {
-                vote.completed = completed;
-                vote.finished = true;
-                if (completed) {
-                    captured.remove(vote.id);
-                    if (vote.transferred) acknowledge = vote.recoveryOwner;
-                } else if (accepting && !vote.transferred && !vote.transferring) {
-                    // Retain the same occurrence and hand it to recovery after
-                    // the normal callback has finished, including partial failures.
-                    transferLocked(vote);
-                }
-            }
-            if (completed && vote.recoveryOwner != null) vote.recoveryOwner.releaseCapture(vote.id);
-            if (acknowledge != null) acknowledge.acknowledgeOccurrence(vote.id);
-            else if (vote.transferred && vote.recoveryOwner != null) vote.recoveryOwner.resumeTransfers();
-        }
-    }
-
-    private void transferLocked(CapturedVote vote) {
-        if (vote.transferring) return;
-        vote.transferring = true;
-        VotifierVoteOverflowQueue overflow = vote.recoveryOwner != null
-                ? vote.recoveryOwner : plugin.getVotifierVoteOverflowQueue();
-        vote.recoveryOwner = overflow;
-        if (overflow == null) { transferred(vote, false); return; }
-        overflow.enqueueAfterInitialization(vote.username, vote.site, vote.occurredAt, vote.id,
-                () -> !vote.started || vote.finished && !vote.completed,
-                accepted -> transferred(vote, accepted));
-    }
-
-    private void transferred(CapturedVote vote, boolean admitted) {
-        boolean completed, retry, reportFailure;
-        synchronized (captureLock) {
-            if (vote.transferred && !admitted) return; // Older failure cannot revoke confirmed queue ownership.
-            vote.transferred = admitted; completed = vote.completed;
-            if (!admitted) vote.transferring = false;
-            if (admitted || completed) captured.remove(vote.id);
-            retry = !admitted && !completed && captured.get(vote.id) == vote;
-            reportFailure = !admitted && !completed && !vote.transferFailureReported;
-            if (reportFailure) vote.transferFailureReported = true;
-        }
-        if (admitted && completed) vote.recoveryOwner.acknowledgeOccurrence(vote.id);
-        if (completed) return; // Current normal processing won; do not leave an ordinary duplicate retry.
-        if (reportFailure) plugin.getLogger().severe("Votifier vote queue unavailable or full; "
-                + (retry ? "captured receipt retained for retry for " : "vote was not admitted for ")
-                + MinecraftUsernameValidator.sanitizeForLog(vote.username));
-        else if (admitted) plugin.getLogger().warning("Vote pipeline unavailable or retiring; queued Votifier vote for retry");
-        if (retry && vote.recoveryOwner != null) vote.recoveryOwner.retryCaptureTransfers(this::retryCapturedTransfers);
-    }
-
-    private void retryCapturedTransfers() {
-        synchronized (captureLock) {
-            for (CapturedVote vote : java.util.List.copyOf(captured.values())) {
-                // Ordinary queued/running callbacks retain their original execution.
-                // Only receipts which already attempted a failed handoff need retry.
-                if (vote.transferFailureReported && !vote.transferring) transferLocked(vote);
-            }
-        }
-    }
+	public VotiferEvent(VotingPluginMain plugin) {
+		this.plugin = plugin;
+	}
 
 	/**
 	 * Processes a validated vote. The overflow queue invokes this callback from
@@ -155,23 +35,7 @@ public class VotiferEvent implements Listener {
 	 * @param voteSite the validated service site
 	 * @param voteUsername the validated player name
 	 */
-	public void processVote(String voteSite, String voteUsername) { processVote(voteSite, voteUsername, 0L); }
-
-    public void processVote(String voteSite, String voteUsername, long occurredAt) {
-        processVote(voteSite, voteUsername, occurredAt, UUID.randomUUID());
-    }
-
-    public void processVote(String voteSite, String voteUsername, long occurredAt, UUID localOccurrenceId) {
-        processCapturedVote(voteSite, voteUsername, occurredAt, localOccurrenceId);
-    }
-
-    /** False retains overflow ownership; partial ordinary effects may still have occurred. */
-    public boolean processVoteConfirmed(String voteSite, String voteUsername, long occurredAt, UUID localOccurrenceId) {
-        return processCapturedVote(voteSite, voteUsername, occurredAt, localOccurrenceId);
-    }
-
-    private boolean processCapturedVote(String voteSite, String voteUsername, long occurredAt, UUID localOccurrenceId) {
-        java.util.Objects.requireNonNull(localOccurrenceId, "localOccurrenceId");
+	public void processVote(String voteSite, String voteUsername) {
 		try {
 			plugin.getServerData().addServiceSite(voteSite);
 			if (plugin.getBungeeSettings().isUseBungeecoord() && !plugin.getBungeeSettings().isVotifierBypass()
@@ -182,7 +46,7 @@ public class VotiferEvent implements Listener {
 							|| plugin.getBackendProxyHandler().getMethod().equals(BungeeMethod.REDIS))) {
 				plugin.getLogger().severe(
 						"Ignoring vote from votifier since a proxy vote transport is enabled; receive votes on the proxy or enable VotifierBypass, then check: https://github.com/BenCodez/VotingPlugin/wiki/Bungeecord-Setups");
-				return true;
+				return;
 			}
 
 			String matchSite = "";
@@ -213,29 +77,22 @@ public class VotiferEvent implements Listener {
 			if (plugin.getTimeChecker().isActiveProcessing()
 					&& plugin.getConfigFile().isQueueVotesDuringTimeChange()) {
 				plugin.debug("Adding vote to time queue " + voteUsername + "/" + voteSite);
-				plugin.getTimeQueueHandler().addVote(voteUsername, voteSite, occurredAt, localOccurrenceId);
-				return true;
+				plugin.getTimeQueueHandler().addVote(voteUsername, voteSite);
+				return;
 			}
 
 			String voteSiteName = plugin.getVoteSiteManager().getVoteSiteName(true, serviceSite, matchSite);
 
 			PlayerVoteEvent voteEvent = new PlayerVoteEvent(
 					plugin.getVoteSiteManager().getVoteSite(voteSiteName, true), voteUsername, voteSite, true);
-            voteEvent.setLocalOccurrenceId(localOccurrenceId);
-            if (occurredAt > 0) voteEvent.setCanonicalOccurrenceTime(occurredAt);
 			plugin.getServer().getPluginManager().callEvent(voteEvent);
 
 			if (voteEvent.isCancelled()) {
 				plugin.debug("Vote cancelled");
 			}
-            // Bukkit may skip disabled listeners or catch their exceptions while
-            // returning normally. Dispatch alone is not confirmed processing.
-            return voteEvent.isNativeProcessingCompleted()
-                    || voteEvent.isCancelled() && !voteEvent.isNativeProcessingStarted();
 		} catch (Exception e) {
 			plugin.getLogger().severe("Error occured during vote processing");
 			e.printStackTrace();
-            return false; // An exception does not prove ordinary accounting/rewards completed.
 		}
 	}
 
@@ -246,9 +103,6 @@ public class VotiferEvent implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
 	public void onVotiferEvent(VotifierEvent event) {
-        if (!accepting) return;
-        final long occurredAt = System.currentTimeMillis();
-        final UUID localOccurrenceId = UUID.randomUUID();
 
 		Vote vote = event.getVote();
 		String str = vote.getServiceName();
@@ -281,58 +135,16 @@ public class VotiferEvent implements Listener {
 		plugin.debug("VoteSite: " + voteSite);
 		plugin.debug("IP: " + IP);
 
-        CapturedVote capturedVote = new CapturedVote(voteUsername, voteSite, occurredAt, localOccurrenceId);
-        VotifierVoteOverflowQueue.CaptureAdmission admission;
-        synchronized (captureLock) {
-            if (!accepting) return;
-            var overflow = plugin.getVotifierVoteOverflowQueue();
-            capturedVote.recoveryOwner = overflow;
-            if (captured.size() >= MAX_CAPTURED) {
-                // The overflow owns its independent bounded admission lane.
-                transferLocked(capturedVote);
-                return;
-            }
-            admission = overflow == null ? VotifierVoteOverflowQueue.CaptureAdmission.ACCEPTED
-                    : overflow.reserveCapture(localOccurrenceId);
-            if (admission == VotifierVoteOverflowQueue.CaptureAdmission.REJECTED) {
-                plugin.getLogger().severe("Votifier capture capacity unavailable; vote was not admitted");
-                return;
-            }
-            // Reserve known capacity and publish capture ownership together with
-            // respect to stop's snapshot. Unknown capacity remains provisional.
-            captured.put(localOccurrenceId, capturedVote);
-        }
-        if (admission == VotifierVoteOverflowQueue.CaptureAdmission.WAITING_FOR_LOAD) {
-            capturedVote.recoveryOwner.reserveCaptureAfterInitialization(localOccurrenceId,
-                    admitted -> admitCaptured(capturedVote, admitted));
-        } else admitCaptured(capturedVote, true);
+		try {
+			plugin.getVoteTimer().submit(() -> processVote(voteSite, voteUsername));
+		} catch (RejectedExecutionException rejected) {
+			VotifierVoteOverflowQueue overflow = plugin.getVotifierVoteOverflowQueue();
+			if (overflow == null || !overflow.enqueue(voteUsername, voteSite)) {
+				plugin.getLogger().severe("Votifier vote queue is full; vote was not admitted for "
+						+ MinecraftUsernameValidator.sanitizeForLog(voteUsername));
+			} else {
+				plugin.getLogger().warning("Vote executor saturated; queued Votifier vote for retry");
+			}
+		}
 	}
-
-    private void admitCaptured(CapturedVote vote, boolean admitted) {
-        synchronized (captureLock) {
-            if (captured.get(vote.id) != vote) {
-                if (admitted && vote.recoveryOwner != null) vote.recoveryOwner.releaseCapture(vote.id);
-                return;
-            }
-            if (!admitted) {
-                captured.remove(vote.id);
-                plugin.getLogger().severe("Votifier capture capacity unavailable; vote was not admitted");
-                return;
-            }
-            if (!accepting) {
-                if (!retirementQueued) transferLocked(vote);
-                return;
-            }
-        }
-        try {
-            var timer = plugin.getVoteTimer();
-            if (timer == null) {
-                synchronized (captureLock) { transferLocked(vote); }
-                return;
-            }
-            timer.submit(() -> runCaptured(vote));
-        } catch (RejectedExecutionException rejected) {
-            synchronized (captureLock) { transferLocked(vote); }
-        }
-    }
 }

VotingPlugin/src/main/java/com/bencodez/votingplugin/listeners/VotifierVoteOverflowQueue.java

@@ -4,9 +4,6 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.SeekableByteChannel;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.channels.OverlappingFileLockException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.AtomicMoveNotSupportedException;
 import java.nio.file.Files;
@@ -20,15 +17,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.Properties;
-import java.util.UUID;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 
 import org.bukkit.configuration.file.YamlConfiguration;
 
@@ -45,65 +37,22 @@ import com.bencodez.votingplugin.util.ServiceSiteValidator;
 public final class VotifierVoteOverflowQueue implements AutoCloseable {
 	/* Keep the overflow bounded independently of the executor's 256 admissions. */
 	private static final int MAX_ENTRIES = 256;
-    public static final int MAX_CAPTURED = 256;
-    private static final int MAX_RETAINED_ENTRIES = MAX_ENTRIES + MAX_CAPTURED;
 	private static final long MAX_FILE_BYTES = 4L * 1024L * 1024L;
 	private static final long RETRY_DELAY_MILLIS = 250L;
 	private static final String QUEUE_FILE = "VotifierVoteQueue.yml";
-	private static final String OWNER_FILE = "VotifierVoteQueue.yml.owner";
-	private static final String SHARED_OWNER_PROPERTY_PREFIX = "com.bencodez.votingplugin.VotifierVoteOverflowQueue.owner.";
-	private static final int MAX_OWNER_RESERVATIONS = 1024;
 
 	private final VotingPluginMain plugin;
-	@FunctionalInterface
-	public interface VoteProcessor { void process(String serviceSite, String username, long occurredAt); }
-	@FunctionalInterface
-	public interface OccurrenceProcessor {
-        void process(String serviceSite, String username, long occurredAt, UUID localOccurrenceId);
-        /** Legacy callbacks confirm completion by returning normally. */
-        default boolean processConfirmed(String serviceSite, String username, long occurredAt, UUID localOccurrenceId) {
-            process(serviceSite, username, occurredAt, localOccurrenceId);
-            return true;
-        }
-    }
-    @FunctionalInterface
-    public interface ConfirmedOccurrenceProcessor {
-        boolean processConfirmed(String serviceSite, String username, long occurredAt, UUID localOccurrenceId);
-    }
-	private final OccurrenceProcessor processor;
-    private final java.util.function.BooleanSupplier processingAllowed;
+	private final BiConsumer<String, String> processor;
 	private final Path file;
-	private final Path ownerFile;
-	private FileChannel ownerChannel;
-	private FileLock ownerLock;
-	private String ownerKey;
-	private String ownerToken;
-	private Properties ownerProperties;
 	private final ScheduledThreadPoolExecutor worker;
 	private final Object lock = new Object();
 	private final Object persistenceWriteLock = new Object();
 	private final ArrayDeque<PendingVote> entries = new ArrayDeque<>();
 	private boolean drainScheduled;
-    private boolean drainRetryScheduled;
-	private boolean captureRetryScheduled;
 	private boolean persistenceScheduled;
 	private boolean persistenceDirty;
 	private boolean started;
 	private boolean closed;
-    private boolean closing;
-    private final java.util.concurrent.CompletableFuture<Void> closePublication = new java.util.concurrent.CompletableFuture<>();
-    private boolean closeFailureReported;
-    private volatile boolean loaded;
-    private volatile boolean loadFailed;
-    private int pendingIngress;
-    private int pendingCaptureAdmissions;
-    private int pendingRetirementCaptures;
-    private boolean retirementRequested;
-    private boolean initializationRetryScheduled;
-    private boolean initializationFailureReported;
-    private boolean queueFileObserved;
-    private final Set<UUID> captureReservations = new java.util.HashSet<>();
-    private final boolean asynchronousInitialization;
 	private long stateVersion;
 	private long durableVersion;
 
@@ -114,56 +63,16 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 	 * @param processor callback receiving service site and player name
 	 */
 	public VotifierVoteOverflowQueue(VotingPluginMain plugin, BiConsumer<String, String> processor) {
-        this(plugin, (site, user, occurredAt, id) -> processor.accept(site, user), () -> true);
-    }
-
-    /** Additive callback retains receipt occurrence and fences a retired startup generation. */
-    public VotifierVoteOverflowQueue(VotingPluginMain plugin, VoteProcessor processor,
-            java.util.function.BooleanSupplier processingAllowed) {
-        this(plugin, (site, user, time, id) -> processor.process(site, user, time), processingAllowed);
-    }
-
-    public VotifierVoteOverflowQueue(VotingPluginMain plugin, OccurrenceProcessor processor,
-            java.util.function.BooleanSupplier processingAllowed) {
-        this(plugin, processor, processingAllowed, false);
-    }
-
-    /** Memory-only construction; all loading and handoffs run on the existing queue worker. */
-    public static VotifierVoteOverflowQueue initializeAsync(VotingPluginMain plugin, OccurrenceProcessor processor,
-            java.util.function.BooleanSupplier processingAllowed) {
-        return new VotifierVoteOverflowQueue(plugin, processor, processingAllowed, true);
-    }
-
-    /** Named factory preserves existing void callback/lambda contracts without ambiguous overloads. */
-    public static VotifierVoteOverflowQueue initializeConfirmedAsync(VotingPluginMain plugin,
-            ConfirmedOccurrenceProcessor processor, java.util.function.BooleanSupplier processingAllowed) {
-        java.util.Objects.requireNonNull(processor, "processor");
-        return initializeAsync(plugin, new OccurrenceProcessor() {
-            @Override public void process(String site, String user, long time, UUID id) {
-                processor.processConfirmed(site, user, time, id);
-            }
-            @Override public boolean processConfirmed(String site, String user, long time, UUID id) {
-                return processor.processConfirmed(site, user, time, id);
-            }
-        }, processingAllowed);
-    }
-
-    private VotifierVoteOverflowQueue(VotingPluginMain plugin, OccurrenceProcessor processor,
-            java.util.function.BooleanSupplier processingAllowed, boolean asynchronousInitialization) {
-        this.asynchronousInitialization = asynchronousInitialization;
 		this.plugin = plugin;
 		this.processor = processor;
-        this.processingAllowed = processingAllowed;
 		this.file = new File(plugin.getDataFolder(), QUEUE_FILE).toPath();
-		this.ownerFile = new File(plugin.getDataFolder(), OWNER_FILE).toPath();
 		this.worker = new ScheduledThreadPoolExecutor(1, runnable -> {
 			Thread thread = new Thread(runnable, "VotingPlugin-Votifier-Overflow");
 			thread.setDaemon(true);
 			return thread;
 		});
 		this.worker.setRemoveOnCancelPolicy(true);
-		if (asynchronousInitialization) worker.execute(this::load);
-        else load();
+		load();
 	}
 
 	/**
@@ -188,88 +97,10 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 	 * @return false when the bounded overflow is full or shutting down
 	 */
 	public boolean enqueue(String username, String serviceSite) {
-        return enqueue(username, serviceSite, System.currentTimeMillis());
-    }
-
-    public boolean enqueue(String username, String serviceSite, long occurredAt) {
-        return enqueue(username, serviceSite, occurredAt, UUID.randomUUID());
-    }
-
-    public boolean enqueue(String username, String serviceSite, long occurredAt, UUID localOccurrenceId) {
-        return enqueueStored(username, serviceSite, occurredAt, localOccurrenceId, false);
-    }
-
-    /** Transfer stays behind initial loading and is bounded independently of executor admissions. */
-    public void enqueueAfterInitialization(String username, String serviceSite, long occurredAt, UUID localOccurrenceId,
-            Consumer<Boolean> completion) {
-        enqueueAfterInitialization(username, serviceSite, occurredAt, localOccurrenceId, () -> true, completion);
-    }
-
-    /** A STARTED original callback retains execution ownership until its outcome is known. */
-    public void enqueueAfterInitialization(String username, String serviceSite, long occurredAt, UUID localOccurrenceId,
-            java.util.function.BooleanSupplier executionReleased, Consumer<Boolean> completion) {
-        if (username == null || serviceSite == null || occurredAt <= 0 || localOccurrenceId == null) {
-            completion.accept(false);
-            return;
-        }
-        var finished = new java.util.concurrent.atomic.AtomicBoolean();
-        class Transfer implements Runnable {
-            void finish(boolean accepted) {
-                if (!finished.compareAndSet(false, true)) return;
-                synchronized (lock) { pendingIngress--; }
-                completion.accept(accepted);
-            }
-            @Override public void run() {
-                try {
-                    synchronized (lock) {
-                        if (!closed && !loaded) {
-                            // Admission owns this receipt, including the saturated
-                            // path which has no entry in the listener's capture map.
-                            scheduleInitializationRetryLocked();
-                            worker.schedule(this, RETRY_DELAY_MILLIS, TimeUnit.MILLISECONDS);
-                            return;
-                        }
-                    }
-                } catch (RejectedExecutionException rejected) { finish(false); return; }
-                boolean accepted = false;
-                try { accepted = enqueueStored(username, serviceSite, occurredAt, localOccurrenceId, true, executionReleased); }
-                finally { finish(accepted); }
-            }
-        }
-        boolean submitted = false;
-        synchronized (lock) {
-            if (!closed && !closing && pendingIngress < MAX_ENTRIES) {
-                pendingIngress++;
-                try {
-                    worker.execute(new Transfer());
-                    submitted = true;
-                } catch (RejectedExecutionException rejected) { pendingIngress--; }
-            }
-        }
-        if (!submitted) completion.accept(false);
-    }
-
-    private boolean enqueueStored(String username, String serviceSite, long occurredAt, UUID localOccurrenceId,
-            boolean admittedTransfer) {
-        return enqueueStored(username, serviceSite, occurredAt, localOccurrenceId, admittedTransfer, () -> true);
-    }
-
-    private boolean enqueueStored(String username, String serviceSite, long occurredAt, UUID localOccurrenceId,
-            boolean admittedTransfer, java.util.function.BooleanSupplier executionReleased) {
-		if (username == null || serviceSite == null || occurredAt <= 0 || localOccurrenceId == null) return false;
+		if (username == null || serviceSite == null) return false;
 		synchronized (lock) {
-            if (closed || closing && !admittedTransfer || !loaded || loadFailed) return false;
-            var existing = occurrence(localOccurrenceId);
-            if (existing != null) {
-                boolean same = matches(existing, username, serviceSite, occurredAt);
-                if (same) captureReservations.remove(localOccurrenceId);
-                return same;
-            }
-            int entryLimit = closing && admittedTransfer ? MAX_RETAINED_ENTRIES : MAX_ENTRIES;
-            if (entries.size() >= entryLimit || !captureReservations.contains(localOccurrenceId)
-                    && entries.size() + captureReservations.size() >= MAX_RETAINED_ENTRIES) return false;
-            entries.addLast(new PendingVote(username, serviceSite, occurredAt, localOccurrenceId, executionReleased));
-            captureReservations.remove(localOccurrenceId);
+			if (closed || entries.size() >= MAX_ENTRIES) return false;
+			entries.addLast(new PendingVote(username, serviceSite, System.currentTimeMillis()));
 			stateVersion++;
 			requestPersistenceLocked();
 			scheduleDrainLocked();
@@ -277,162 +108,6 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 		}
 	}
 
-    public enum CaptureAdmission { ACCEPTED, WAITING_FOR_LOAD, REJECTED }
-
-    /** Reserve final-snapshot capacity before the normal executor owns this receipt. */
-    public CaptureAdmission reserveCapture(UUID id) {
-        java.util.Objects.requireNonNull(id);
-        synchronized (lock) {
-            if (closed || closing || loadFailed) return CaptureAdmission.REJECTED;
-            if (!loaded) return CaptureAdmission.WAITING_FOR_LOAD;
-            if (captureReservations.contains(id)) return CaptureAdmission.ACCEPTED;
-            if (captureReservations.size() >= MAX_CAPTURED
-                    || entries.size() + captureReservations.size() >= MAX_RETAINED_ENTRIES)
-                return CaptureAdmission.REJECTED;
-            captureReservations.add(id);
-            return CaptureAdmission.ACCEPTED;
-        }
-    }
-
-    /** Unknown disk capacity is provisional; keep at most one deferred admission per capture. */
-    public void reserveCaptureAfterInitialization(UUID id, Consumer<Boolean> completion) {
-        java.util.Objects.requireNonNull(id); java.util.Objects.requireNonNull(completion);
-        boolean admitted;
-        synchronized (lock) {
-            admitted = !closed && !closing && pendingCaptureAdmissions < MAX_CAPTURED;
-            if (admitted) pendingCaptureAdmissions++;
-        }
-        if (!admitted) { completion.accept(false); return; }
-        var finished = new java.util.concurrent.atomic.AtomicBoolean();
-        class Admission implements Runnable {
-            void finish(boolean accepted) {
-                if (!finished.compareAndSet(false, true)) return;
-                synchronized (lock) { pendingCaptureAdmissions--; }
-                completion.accept(accepted);
-            }
-            @Override public void run() {
-                var result = reserveCapture(id);
-                if (result != CaptureAdmission.WAITING_FOR_LOAD) {
-                    finish(result == CaptureAdmission.ACCEPTED);
-                    return;
-                }
-                try { worker.schedule(this, RETRY_DELAY_MILLIS, TimeUnit.MILLISECONDS); }
-                catch (RejectedExecutionException rejected) { finish(false); }
-            }
-        }
-        var admission = new Admission();
-        try { worker.execute(admission); }
-        catch (RejectedExecutionException rejected) { admission.finish(false); }
-    }
-
-    public void releaseCapture(UUID id) {
-        synchronized (lock) { captureReservations.remove(id); }
-    }
-
-    public record RetiringCapture(String username, String serviceSite, long time, UUID id,
-            java.util.function.BooleanSupplier executionReleased,
-            java.util.function.BooleanSupplier completed, Consumer<Boolean> completion) {
-        public RetiringCapture {
-            java.util.Objects.requireNonNull(username); java.util.Objects.requireNonNull(serviceSite);
-            java.util.Objects.requireNonNull(id); java.util.Objects.requireNonNull(executionReleased);
-            java.util.Objects.requireNonNull(completed); java.util.Objects.requireNonNull(completion);
-            if (time <= 0) throw new IllegalArgumentException("capture receipt time must be positive");
-        }
-    }
-
-    /** One FIFO batch, before close's final snapshot; normal overflow admission stays capped at256. */
-    public void retireCaptures(List<RetiringCapture> captures) {
-        var snapshot = List.copyOf(captures);
-        if (snapshot.size() > MAX_CAPTURED) throw new IllegalArgumentException("capture retirement exceeds capacity");
-        if (snapshot.isEmpty()) return;
-        class Transfer implements Runnable {
-            @Override public void run() {
-                synchronized (lock) {
-                    if (!closed && (!loaded || loadFailed)) {
-                        scheduleInitializationRetryLocked();
-                        worker.schedule(this, RETRY_DELAY_MILLIS, TimeUnit.MILLISECONDS);
-                        return;
-                    }
-                }
-                boolean[] results = new boolean[snapshot.size()];
-                try {
-                    for (int index = 0; index < snapshot.size(); index++) {
-                        var capture = snapshot.get(index);
-                        boolean completed = false;
-                        try { completed = capture.completed().getAsBoolean(); }
-                        catch (RuntimeException | Error unknown) { /* Retain unconfirmed completion. */ }
-                        synchronized (lock) {
-                            if (!closed && loaded && !loadFailed) {
-                                var existing = occurrence(capture.id());
-                                if (completed) {
-                                    captureReservations.remove(capture.id());
-                                    results[index] = true;
-                                } else if (existing != null) {
-                                    results[index] = matches(existing, capture.username(), capture.serviceSite(), capture.time());
-                                    if (results[index]) captureReservations.remove(capture.id());
-                                } else if (entries.size() < MAX_RETAINED_ENTRIES
-                                        && (captureReservations.contains(capture.id())
-                                            || entries.size() + captureReservations.size() < MAX_RETAINED_ENTRIES)) {
-                                    entries.addLast(new PendingVote(capture.username(), capture.serviceSite(), capture.time(),
-                                            capture.id(), capture.executionReleased()));
-                                    captureReservations.remove(capture.id());
-                                    stateVersion++; requestPersistenceLocked();
-                                    results[index] = true;
-                                }
-                            }
-                        }
-                    }
-                    // Retain the whole batch before any external completion callback.
-                    for (int index = 0; index < snapshot.size(); index++) {
-                        try { snapshot.get(index).completion().accept(results[index]); }
-                        catch (RuntimeException | Error failure) {
-                            try { plugin.getLogger().warning("Votifier retirement callback failed; queue ownership is retained"); }
-                            catch (RuntimeException | Error ignored) { }
-                        }
-                    }
-                } finally {
-                    synchronized (lock) { pendingRetirementCaptures -= snapshot.size(); }
-                }
-            }
-        }
-        boolean submitted = false;
-        synchronized (lock) {
-            if (!closed && !closing && pendingRetirementCaptures + snapshot.size() <= MAX_CAPTURED) {
-                pendingRetirementCaptures += snapshot.size();
-                try { worker.execute(new Transfer()); retirementRequested = true; submitted = true; }
-                catch (RejectedExecutionException rejected) { pendingRetirementCaptures -= snapshot.size(); }
-            }
-        }
-        if (!submitted) for (var capture : snapshot) {
-            try { capture.completion().accept(false); }
-            catch (RuntimeException | Error ignored) { /* Reject every bounded caller, including the suffix. */ }
-        }
-    }
-
-    private void scheduleInitializationRetryLocked() {
-        if (closed || initializationRetryScheduled || loaded && !loadFailed) return;
-        initializationRetryScheduled = true;
-        worker.schedule(() -> {
-            synchronized (lock) {
-                initializationRetryScheduled = false;
-                if (closed) return;
-            }
-            load();
-        }, RETRY_DELAY_MILLIS, TimeUnit.MILLISECONDS);
-    }
-
-    private PendingVote occurrence(UUID id) {
-        for (var vote : entries) if (vote.localOccurrenceId.equals(id)) return vote;
-        return null;
-    }
-
-    private static boolean matches(PendingVote vote, String username, String site, long time) {
-        return vote.username.equals(username) && vote.serviceSite.equals(site) && vote.time == time;
-    }
-
-    /** Completion only; transfers separately report load/capacity admission failure. */
-    public boolean isInitializationComplete() { return loaded; }
-
 	/**
 	 * Returns the number of votes waiting for admission or completion.
 	 *
@@ -451,7 +126,7 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 	}
 
 	private void scheduleDrainLocked() {
-		if (closed || closing || !loaded || loadFailed || !started || drainScheduled) return;
+		if (closed || !started || drainScheduled) return;
 		drainScheduled = true;
 		try {
 			worker.schedule(this::drain, 0, TimeUnit.MILLISECONDS);
@@ -462,14 +137,7 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 
 	private void drain() {
 		while (true) {
-            // A generation fence parks its receipts instead of repeatedly submitting
-            // callbacks which are forbidden to execute (including inline submitters).
-            if (!processingAllowed.getAsBoolean()) {
-                synchronized (lock) { drainScheduled = false; }
-                return;
-            }
 			synchronized (lock) {
-                if (closed || closing || !loaded || loadFailed) { drainScheduled = false; return; }
 				if (durableVersion != stateVersion) {
 					drainScheduled = false;
 					return;
@@ -484,23 +152,10 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 					// Serialize admission with enqueue so the version proven durable
 					// above cannot change in the gap before submit accepts this vote.
 					plugin.getVoteTimer().submit(() -> {
-						boolean attempted = false;
-						boolean completed = false;
 						try {
-                            if (!processingAllowed.getAsBoolean()) return;
-                            synchronized (lock) {
-                                if (closed || closing || !entries.contains(pending)) return;
-                            }
-                            attempted = true;
-							completed = processor.processConfirmed(pending.serviceSite, pending.username,
-                                    pending.time, pending.localOccurrenceId) && !Thread.currentThread().isInterrupted();
-                        } catch (RuntimeException | Error failure) {
-                            plugin.getLogger().warning("Queued Votifier processing failed; retained receipt for retry: "
-                                    + failure.getClass().getSimpleName());
-                            throw failure;
+							processor.accept(pending.serviceSite, pending.username);
 						} finally {
-                            if (completed) acknowledge(pending);
-                            else retainFailedAttempt(pending, attempted);
+							acknowledge(pending);
 						}
 					});
 				} catch (RejectedExecutionException rejected) {
@@ -513,102 +168,27 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 						// The queue is closing; the persisted entry remains for restart.
 					}
 					return;
-				} catch (RuntimeException | Error failure) {
-                    // An inline submitter can expose callback failure on this worker.
-                    // Retain retry ownership without leaving drainScheduled stuck true.
-                    drainScheduled = false;
-                    retainFailedAttempt(pending, true);
-                    throw failure;
 				}
 			}
 		}
 	}
 
 	private PendingVote nextUnsubmittedLocked() {
-		long now = System.nanoTime();
-        boolean retryWaiting = false;
 		for (PendingVote pending : entries) {
-			if (pending.submitted || !pending.executionReleased.getAsBoolean()) continue;
-            if (pending.retryNotBeforeNanos != 0 && now - pending.retryNotBeforeNanos < 0) {
-                retryWaiting = true;
-                continue;
-            }
-            return pending;
+			if (!pending.submitted) return pending;
 		}
-        if (retryWaiting) scheduleDrainRetryLocked();
 		return null;
 	}
 
-    private void retainFailedAttempt(PendingVote pending, boolean attempted) {
-        synchronized (lock) {
-            pending.submitted = false;
-            if (closed || closing || !entries.contains(pending) || !attempted) return;
-            // Inline submitters must not retry this same receipt in the current drain.
-            pending.retryNotBeforeNanos = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(RETRY_DELAY_MILLIS);
-            scheduleDrainRetryLocked();
-        }
-    }
-
-    private void scheduleDrainRetryLocked() {
-        if (closed || closing || !loaded || loadFailed || !started || drainRetryScheduled) return;
-        drainRetryScheduled = true;
-        try {
-            worker.schedule(() -> {
-                synchronized (lock) {
-                    drainRetryScheduled = false;
-                    scheduleDrainLocked();
-                }
-            }, RETRY_DELAY_MILLIS, TimeUnit.MILLISECONDS);
-        } catch (RejectedExecutionException rejected) { drainRetryScheduled = false; }
-    }
-
 	private void acknowledge(PendingVote pending) {
 		synchronized (lock) {
-            if (closed) {
-                plugin.getLogger().warning("Completed Votifier callback outlived queue shutdown; retained occurrence requires reconciliation");
-                return;
-            }
-			if (!entries.remove(pending)) return;
+			entries.remove(pending);
 			stateVersion++;
 			requestPersistenceLocked();
 			scheduleDrainLocked();
 		}
 	}
 
-    /** Reconcile a receipt whose original normal callback completed during transfer. */
-    public void acknowledgeOccurrence(UUID localOccurrenceId) {
-        synchronized (lock) {
-            if (closed) {
-                // A nonterminating callback outlived the final snapshot. A retired
-                // writer cannot overwrite a successor's queue; retain uncertainty.
-                plugin.getLogger().warning("Completed Votifier callback outlived queue shutdown; retained occurrence requires reconciliation");
-                return;
-            }
-            if (!entries.removeIf(pending -> pending.localOccurrenceId.equals(localOccurrenceId))) return;
-            stateVersion++; requestPersistenceLocked(); scheduleDrainLocked();
-        }
-    }
-    /** Wake the same bounded drain when an original transferred callback finishes uncertainly. */
-    public void resumeTransfers() { scheduleDrain(); }
-
-    /** One wakeup for the ingress listener's bounded failed-transfer captures.
-     * Retry runs outside the queue monitor and never adds another executor or waiter list. */
-    public void retryCaptureTransfers(Runnable retry) {
-        synchronized (lock) {
-            if (closed || closing || captureRetryScheduled) return;
-            captureRetryScheduled = true;
-            try {
-                worker.schedule(() -> {
-                    synchronized (lock) {
-                        captureRetryScheduled = false;
-                        if (closed || closing) return;
-                    }
-                    retry.run();
-                }, RETRY_DELAY_MILLIS, TimeUnit.MILLISECONDS);
-            } catch (RejectedExecutionException rejected) { captureRetryScheduled = false; }
-        }
-    }
-
 	private void requestPersistenceLocked() {
 		persistenceDirty = true;
 		if (persistenceScheduled) return;
@@ -659,32 +239,18 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 	}
 
 	private void load() {
-        ArrayDeque<PendingVote> recovered = new ArrayDeque<>();
-        boolean successful = false;
 		try {
-			synchronized (lock) { if (closed || loaded && !loadFailed) return; }
-			if (!acquireOwner()) {
-                synchronized (lock) {
-                    if (asynchronousInitialization && !closing || pendingRetirementCaptures > 0 || pendingIngress > 0) {
-                        scheduleInitializationRetryLocked();
-                        return;
-                    }
-                }
-				throw new IOException("queue file is owned by another active instance");
-			}
-            if (!Files.exists(file, LinkOption.NOFOLLOW_LINKS)) {
-                if (queueFileObserved) throw new IOException("queue file disappeared before recovery");
-                successful = true;
-                return;
-            }
-            queueFileObserved = true;
+			if (!Files.exists(file, LinkOption.NOFOLLOW_LINKS)) return;
 			YamlConfiguration yaml = new YamlConfiguration();
 			yaml.loadFromString(readQueueFile());
 			Object raw = yaml.get("Votes");
-			if (!(raw instanceof List<?> values)) throw new IOException("queue votes are not a list");
-            if (values.size() > MAX_RETAINED_ENTRIES) throw new IOException("queue exceeds entry capacity");
+			if (!(raw instanceof List<?> values)) return;
 			boolean skipped = false;
 			for (Object value : values) {
+				if (entries.size() >= MAX_ENTRIES) {
+					skipped = true;
+					break;
+				}
 				if (!(value instanceof Map<?, ?> map)) {
 					skipped = true;
 					continue;
@@ -699,111 +265,16 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 					skipped = true;
 					continue;
 				}
-				UUID localOccurrenceId;
-                if (!map.containsKey("LocalOccurrenceId")) {
-                    localOccurrenceId = UUID.randomUUID();
-                    skipped = true; // Publish the migration before admitting any recovered row.
-                } else {
-                    Object rawId = map.get("LocalOccurrenceId");
-                    try {
-                        if (!(rawId instanceof String id)) throw new IllegalArgumentException();
-                        localOccurrenceId = UUID.fromString(id);
-                        if (!localOccurrenceId.toString().equalsIgnoreCase(id)) throw new IllegalArgumentException();
-                    } catch (IllegalArgumentException malformed) {
-                        skipped = true;
-                        continue; // Explicit corrupt IDs cannot become fresh occurrences.
-                    }
-                }
-                recovered.addLast(new PendingVote(name, site, timestamp.longValue(), localOccurrenceId));
+				entries.addLast(new PendingVote(name, site, timestamp.longValue()));
 			}
-            synchronized (lock) { entries.clear(); entries.addAll(recovered); }
 			if (skipped) {
 				synchronized (lock) {
 					stateVersion++;
 					requestPersistenceLocked();
 				}
 			}
-            successful = true;
 		} catch (Exception failure) {
-            loadFailed = true;
-            if (!initializationFailureReported) {
-                initializationFailureReported = true;
-                plugin.getLogger().warning("Unable to load queued Votifier votes: " + failure.getClass().getSimpleName());
-            }
-		} finally {
-            if (ownerLock == null && !loadFailed) return;
-            if (successful) loadFailed = false;
-            loaded = true;
-            synchronized (lock) {
-                scheduleDrainLocked();
-                if (loadFailed && pendingRetirementCaptures > 0) scheduleInitializationRetryLocked();
-            }
-        }
-	}
-
-	private boolean acquireOwner() throws IOException {
-		if (ownerLock != null && ownerLock.isValid()) return true;
-		Path parent = ownerFile.toAbsolutePath().normalize().getParent();
-		if (parent == null || Files.isSymbolicLink(ownerFile)) throw new IOException("queue ownership file is unsafe");
-		Files.createDirectories(parent);
-		String key = SHARED_OWNER_PROPERTY_PREFIX + hashOwnerPath(parent.toRealPath().resolve(ownerFile.getFileName()));
-		String token = UUID.randomUUID().toString();
-		Properties properties = System.getProperties();
-		synchronized (properties) {
-			if (properties.getProperty(key) != null) return false;
-			int reservations = 0;
-			for (Object property : properties.keySet())
-				if (property instanceof String name && name.startsWith(SHARED_OWNER_PROPERTY_PREFIX)) reservations++;
-			if (reservations >= MAX_OWNER_RESERVATIONS) return false;
-			properties.setProperty(key, token);
-		}
-		try {
-			FileChannel channel = FileChannel.open(ownerFile, StandardOpenOption.CREATE, StandardOpenOption.WRITE,
-					LinkOption.NOFOLLOW_LINKS);
-			try {
-				FileLock acquired;
-				try { acquired = channel.tryLock(); }
-				catch (OverlappingFileLockException busy) { acquired = null; }
-				if (acquired == null) { channel.close(); clearOwnerReservation(properties, key, token); return false; }
-				ownerKey = key; ownerToken = token; ownerProperties = properties; ownerChannel = channel; ownerLock = acquired;
-				return true;
-			} catch (IOException | RuntimeException failure) {
-				channel.close();
-				clearOwnerReservation(properties, key, token);
-				throw failure;
-			}
-		} catch (IOException | RuntimeException failure) {
-			clearOwnerReservation(properties, key, token);
-			throw failure;
-		}
-	}
-
-	private void releaseOwner() {
-		try { if (ownerLock != null) ownerLock.release(); } catch (IOException ignored) { }
-		try { if (ownerChannel != null) ownerChannel.close(); } catch (IOException ignored) { }
-		clearOwnerReservation(ownerProperties, ownerKey, ownerToken);
-		ownerLock = null;
-		ownerChannel = null;
-		ownerKey = null;
-		ownerToken = null;
-		ownerProperties = null;
-	}
-
-	private static void clearOwnerReservation(Properties properties, String key, String token) {
-		if (properties == null || key == null || token == null) return;
-		synchronized (properties) {
-			if (token.equals(properties.getProperty(key))) properties.remove(key);
-		}
-	}
-
-	private static String hashOwnerPath(Path path) throws IOException {
-		try {
-			byte[] digest = MessageDigest.getInstance("SHA-256").digest(path.toString().getBytes(StandardCharsets.UTF_8));
-			StringBuilder result = new StringBuilder(digest.length * 2);
-			for (byte value : digest) result.append(String.format("%02x", value));
-			return result.toString();
-		} catch (NoSuchAlgorithmException impossible) {
-			throw new IOException("SHA-256 unavailable", impossible);
+			plugin.getLogger().warning("Unable to load queued Votifier votes: " + failure.getClass().getSimpleName());
 		}
 	}
 
@@ -827,8 +298,6 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 	}
 
 	private void writeSnapshotLocked(List<PendingVote> snapshot) throws IOException {
-		if (ownerLock == null || !ownerLock.isValid()) throw new IOException("queue file ownership is unavailable");
-        if (snapshot.size() > MAX_RETAINED_ENTRIES) throw new IOException("queue snapshot exceeds entry capacity");
 		YamlConfiguration yaml = new YamlConfiguration();
 		List<Map<String, Object>> values = new ArrayList<>();
 		for (PendingVote pending : snapshot) {
@@ -836,7 +305,6 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 			value.put("Username", pending.username);
 			value.put("ServiceSite", pending.serviceSite);
 			value.put("Time", pending.time);
-            value.put("LocalOccurrenceId", pending.localOccurrenceId.toString());
 			values.add(value);
 		}
 		yaml.set("Votes", values);
@@ -862,26 +330,21 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 
 	@Override
 	public void close() {
-        List<PendingVote> snapshot = null;
-        boolean initializedWorker;
+		List<PendingVote> snapshot;
 		synchronized (lock) {
-            initializedWorker = asynchronousInitialization || retirementRequested || pendingIngress > 0;
-            if (!initializedWorker) {
-                if (closed) return;
-                closed = true;
-                // Legacy callers keep their existing close path until retirement admission.
-                snapshot = new ArrayList<>(entries);
-                persistenceScheduled = false;
-            }
+			if (closed) return;
+			closed = true;
+			// At-least-once delivery: retain any unacknowledged callback. A callback
+			// interrupted during shutdown must be replayed rather than silently lost.
+			snapshot = new ArrayList<>(entries);
+			persistenceScheduled = false;
 		}
-        if (initializedWorker) { closeInitializedWorker(); return; }
 		worker.shutdownNow();
 		try {
 			worker.awaitTermination(1, TimeUnit.SECONDS);
 		} catch (InterruptedException interrupted) {
 			Thread.currentThread().interrupt();
 		}
-		if (loadFailed) { releaseOwner(); return; }
 		try {
 			synchronized (persistenceWriteLock) {
 				writeSnapshotLocked(snapshot);
@@ -890,87 +353,18 @@ public final class VotifierVoteOverflowQueue implements AutoCloseable {
 			plugin.getLogger().warning("Unable to persist queued Votifier votes during shutdown: "
 					+ failure.getClass().getSimpleName());
 		}
-		releaseOwner();
 	}
 
-    private void closeInitializedWorker() {
-        synchronized (lock) {
-            if (!closing && !closed) {
-                closing = true;
-                // Keep the existing worker and file owner through failed final publication.
-                worker.execute(this::finishClosePublication);
-            }
-        }
-        try { closePublication.get(1, TimeUnit.SECONDS); }
-        catch (java.util.concurrent.TimeoutException pending) {
-            plugin.getLogger().warning("Votifier queue shutdown publication is still pending on its worker; recovery is unconfirmed");
-        } catch (InterruptedException interrupted) { Thread.currentThread().interrupt(); }
-        catch (java.util.concurrent.ExecutionException failure) {
-            throw new IllegalStateException("Votifier queue shutdown publication failed", failure.getCause());
-        }
-    }
-
-    private void finishClosePublication() {
-        List<PendingVote> snapshot;
-        long version;
-        synchronized (lock) {
-            if (closed) return;
-            if (pendingRetirementCaptures > 0 || pendingIngress > 0) {
-                if (!loaded || loadFailed) scheduleInitializationRetryLocked();
-                worker.schedule(this::finishClosePublication, RETRY_DELAY_MILLIS, TimeUnit.MILLISECONDS);
-                return;
-            }
-            snapshot = new ArrayList<>(entries);
-            version = stateVersion;
-        }
-        if (loadFailed || !loaded) {
-            // Unreadable/unowned storage is unknown; never replace it with an empty guess.
-            synchronized (lock) { closed = true; }
-            releaseOwner(); worker.shutdown(); closePublication.complete(null);
-            return;
-        }
-        try { synchronized (persistenceWriteLock) { writeSnapshotLocked(snapshot); } }
-        catch (IOException failure) {
-            if (!closeFailureReported) {
-                closeFailureReported = true;
-                try { plugin.getLogger().warning("Unable to publish final Votifier queue; its worker retains ownership for retry"); }
-                catch (RuntimeException | Error ignored) { }
-            }
-            worker.schedule(this::finishClosePublication, RETRY_DELAY_MILLIS, TimeUnit.MILLISECONDS);
-            return;
-        }
-        synchronized (lock) {
-            // A confirmed original callback may have removed a receipt during IO.
-            if (version != stateVersion) {
-                worker.execute(this::finishClosePublication);
-                return;
-            }
-            closed = true;
-            durableVersion = version;
-        }
-        releaseOwner(); worker.shutdown(); closePublication.complete(null);
-    }
-
 	private static final class PendingVote {
 		private final String username;
 		private final String serviceSite;
 		private final long time;
-        private final UUID localOccurrenceId;
-		private final java.util.function.BooleanSupplier executionReleased;
 		private boolean submitted;
-        private long retryNotBeforeNanos;
 
-		private PendingVote(String username, String serviceSite, long time, UUID localOccurrenceId) {
-			this(username, serviceSite, time, localOccurrenceId, () -> true);
-		}
-
-		private PendingVote(String username, String serviceSite, long time, UUID localOccurrenceId,
-                java.util.function.BooleanSupplier executionReleased) {
+		private PendingVote(String username, String serviceSite, long time) {
 			this.username = username;
 			this.serviceSite = serviceSite;
 			this.time = time;
-            this.localOccurrenceId = localOccurrenceId;
-            this.executionReleased = java.util.Objects.requireNonNull(executionReleased);
 		}
 	}
 }

VotingPlugin/src/main/java/com/bencodez/votingplugin/maintenance/AutoCreateVoteSitesReminderService.java

@@ -1,212 +0,0 @@
-package com.bencodez.votingplugin.maintenance;
-
-import java.io.IOException;
-import java.nio.file.Path;
-import java.util.Objects;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.LongSupplier;
-import java.util.logging.Logger;
-
-import com.bencodez.votingplugin.core.maintenance.AutoCreateVoteSitesReminderState;
-import com.bencodez.votingplugin.core.maintenance.AutoCreateVoteSitesReminderState.Candidate;
-import com.bencodez.votingplugin.core.maintenance.AutoCreateVoteSitesReminderState.Snapshot;
-import com.bencodez.votingplugin.util.DurableFiles.PublishedException;
-
-/** Owner-only console reminder; all file work runs on its bounded background worker. */
-public final class AutoCreateVoteSitesReminderService {
-
-	public record Settings(boolean enabled, boolean autoCreateEnabled, long afterMillis, long repeatMillis) {
-		public Settings {
-			if (afterMillis < 0 || repeatMillis <= 0
-					|| afterMillis > AutoCreateVoteSitesReminderState.MAX_INTERVAL_MILLIS
-					|| repeatMillis > AutoCreateVoteSitesReminderState.MAX_INTERVAL_MILLIS) {
-				throw new IllegalArgumentException("Reminder intervals must be non-negative and bounded");
-			}
-		}
-	}
-
-	@FunctionalInterface
-	interface StoreFactory {
-		AutoCreateVoteSitesReminderStore create(Path directory) throws IOException;
-	}
-
-	private final Path directory;
-	private final ScheduledExecutorService executor;
-	private final Logger logger;
-	private final LongSupplier clock;
-	private final StoreFactory storeFactory;
-	private final long startedNanos;
-	private final AtomicBoolean started = new AtomicBoolean();
-	private final AtomicBoolean recoveryRequested = new AtomicBoolean();
-	private record CloseRequest(CompletableFuture<Void> result, long stoppedNanos) { }
-	private final AtomicReference<CloseRequest> closing = new AtomicReference<>();
-	private final Object clockGate = new Object();
-	private volatile Settings settings;
-	private volatile ScheduledFuture<?> task;
-	// Accessed only inside the serialized worker checkpoint, never by gameplay callers.
-	private AutoCreateVoteSitesReminderStore store;
-	private AutoCreateVoteSitesReminderState state;
-	private boolean failed;
-	private boolean checkpointRequired;
-	private boolean waitingReported;
-
-	public AutoCreateVoteSitesReminderService(Path directory, ScheduledExecutorService executor,
-			Logger logger, Settings settings) {
-		this(directory, executor, logger, settings, System::nanoTime, AutoCreateVoteSitesReminderStore::new);
-	}
-
-	AutoCreateVoteSitesReminderService(Path directory, ScheduledExecutorService executor,
-			Logger logger, Settings settings, LongSupplier clock, StoreFactory storeFactory) {
-		this.directory = Objects.requireNonNull(directory);
-		this.executor = Objects.requireNonNull(executor);
-		this.logger = Objects.requireNonNull(logger);
-		this.settings = Objects.requireNonNull(settings);
-		this.clock = Objects.requireNonNull(clock);
-		this.storeFactory = Objects.requireNonNull(storeFactory);
-		startedNanos = clock.getAsLong();
-	}
-
-	public void start() {
-		if (closing.get() != null || !started.compareAndSet(false, true)) return;
-		try {
-			task = executor.scheduleWithFixedDelay(this::tick, 0, 60, TimeUnit.SECONDS);
-			if (closing.get() != null) task.cancel(false);
-		} catch (RuntimeException rejected) {
-			logger.warning("AutoCreateVoteSites setup reminder could not start; voting is unaffected.");
-		}
-	}
-
-	/** Reload is a snapshot update, never synchronous file I/O or another periodic task. */
-	public void reload(Settings next) {
-		settings = Objects.requireNonNull(next);
-		recoveryRequested.set(true);
-	}
-
-	private void tick() {
-		long nowNanos;
-		synchronized (clockGate) {
-			if (closing.get() != null) return;
-			nowNanos = clock.getAsLong();
-		}
-		try {
-			checkpoint(nowNanos, false);
-		} catch (IOException | RuntimeException failure) {
-			logger.warning("AutoCreateVoteSites setup reminder paused after a checkpoint failure; "
-					+ "repair its checkpoint if necessary and reload or restart. Voting is unaffected.");
-		}
-	}
-
-	private synchronized void checkpoint(long nowNanos, boolean finalCheckpoint) throws IOException {
-		CloseRequest stopped = closing.get();
-		if (stopped != null) {
-			if (!finalCheckpoint) return;
-			nowNanos = stopped.stoppedNanos();
-		}
-		if (failed && !recoveryRequested.getAndSet(false)) {
-			if (finalCheckpoint) throw new IOException("Reminder checkpoint remains unavailable");
-			return;
-		}
-		try {
-			if (store == null) store = storeFactory.create(directory);
-			if (!store.tryAcquireLease()) {
-				if (finalCheckpoint) throw new IOException("Final reminder checkpoint has no storage ownership");
-				if (!waitingReported) {
-					logger.warning("AutoCreateVoteSites setup reminder is waiting for a retiring reminder worker; "
-							+ "voting is unaffected.");
-					waitingReported = true;
-				}
-				return;
-			}
-			waitingReported = false;
-			if (state == null || failed) {
-				Snapshot saved;
-				try {
-					saved = store.load();
-				} catch (IOException | RuntimeException unverified) {
-					checkpointRequired = true;
-					throw unverified;
-				}
-				if (saved == null && checkpointRequired) {
-					throw new IOException("Reminder checkpoint was removed while running");
-				}
-				if (saved != null) checkpointRequired = true;
-				state = new AutoCreateVoteSitesReminderState(saved == null ? new Snapshot(0, -1) : saved,
-						state == null && !failed ? startedNanos : nowNanos);
-				failed = false;
-			} else if (checkpointRequired && store.load() == null) {
-				throw new IOException("Reminder checkpoint was removed while running");
-			}
-			recoveryRequested.set(false);
-			Settings current = settings;
-			Candidate candidate = state.propose(nowNanos, !finalCheckpoint && current.enabled(),
-					current.autoCreateEnabled(), current.afterMillis(), current.repeatMillis());
-			try {
-				store.save(candidate.snapshot());
-			} catch (PublishedException uncertain) {
-				checkpointRequired = true;
-				throw uncertain;
-			}
-			checkpointRequired = true;
-			state.commit(candidate);
-			// Do not publish a stale warning if shutdown or configuration changed during I/O.
-			if (candidate.reminderDue() && closing.get() == null && current.equals(settings)) {
-				logger.warning("After voting-site setup, set AutoCreateVoteSites: false in Config.yml.");
-			}
-		} catch (IOException | RuntimeException failure) {
-			failed = true;
-			throw failure;
-		}
-	}
-
-	/** Cancel promptly; enqueue the final checkpoint without blocking the server thread. */
-	public CompletableFuture<Void> closeAsync() {
-		CloseRequest request;
-		synchronized (clockGate) {
-			CloseRequest existing = closing.get();
-			if (existing != null) return existing.result();
-			request = new CloseRequest(new CompletableFuture<>(), clock.getAsLong());
-			closing.set(request);
-		}
-		CompletableFuture<Void> result = request.result();
-		long stoppedNanos = request.stoppedNanos();
-		ScheduledFuture<?> current = task;
-		if (current != null) current.cancel(false);
-		if (!started.get()) {
-			result.complete(null);
-			return result;
-		}
-		try {
-			executor.execute(() -> {
-				Exception failure = null;
-				try {
-					checkpoint(stoppedNanos, true);
-				} catch (IOException | RuntimeException checkpointFailure) {
-					failure = checkpointFailure;
-				} finally {
-					if (store != null) {
-						try {
-							store.releaseLease();
-						} catch (IOException | RuntimeException cleanupFailure) {
-							if (failure == null) failure = cleanupFailure;
-							else failure.addSuppressed(cleanupFailure);
-						}
-					}
-				}
-				if (failure == null) result.complete(null);
-				else {
-					logger.warning("AutoCreateVoteSites reminder checkpoint or cleanup did not complete; "
-							+ "inspect its storage before reloading.");
-					result.completeExceptionally(failure);
-				}
-			});
-		} catch (RuntimeException rejected) {
-			result.completeExceptionally(rejected);
-		}
-		return result;
-	}
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/maintenance/AutoCreateVoteSitesReminderStore.java

@@ -1,240 +0,0 @@
-package com.bencodez.votingplugin.maintenance;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.channels.OverlappingFileLockException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.nio.file.OpenOption;
-import java.nio.file.StandardOpenOption;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.PosixFileAttributeView;
-import java.nio.file.attribute.PosixFilePermissions;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.Objects;
-import java.util.Set;
-
-import com.bencodez.votingplugin.core.maintenance.AutoCreateVoteSitesReminderState.Snapshot;
-import com.bencodez.votingplugin.util.DurableFiles;
-
-/**
- * A fixed, checksummed active-runtime checkpoint in the plugin's existing data
- * directory. One reminder worker owns all load/save operations. This store never
- * creates the directory, repairs corrupt records, or follows a record symlink.
- */
-public final class AutoCreateVoteSitesReminderStore {
-
-	private static final String FILE_NAME = ".auto-create-sites-reminder.dat";
-	private static final byte[] MAGIC = "VPACR001".getBytes(StandardCharsets.US_ASCII);
-	private static final int HEADER_BYTES = 24;
-	private static final int RECORD_BYTES = 56;
-	private final Path directory;
-	private final Path target;
-	private final Publisher publisher;
-	private FileChannel leaseChannel;
-	private FileLock lease;
-
-	@FunctionalInterface
-	interface Publisher {
-		void publish(Path staged, Path target) throws IOException;
-	}
-
-	public AutoCreateVoteSitesReminderStore(Path dataDirectory) throws IOException {
-		this(dataDirectory, DurableFiles::publishStagedFile);
-	}
-
-	AutoCreateVoteSitesReminderStore(Path dataDirectory, Publisher publisher) throws IOException {
-		this.directory = Objects.requireNonNull(dataDirectory, "dataDirectory").toAbsolutePath().normalize();
-		this.target = directory.resolve(FILE_NAME);
-		this.publisher = Objects.requireNonNull(publisher, "publisher");
-		validateDirectory();
-	}
-
-	/**
-	 * Nonblocking admission across plugin instances/class loaders in one JVM, held
-	 * through final publication. Multiple JVMs sharing the directory are unsupported:
-	 * closing another channel may release native locks on some platforms.
-	 */
-	public boolean tryAcquireLease() throws IOException {
-		if (lease != null && lease.isValid()) return true;
-		validateDirectory();
-		Path lockPath = directory.resolve(".auto-create-sites-reminder.lock");
-		try {
-			BasicFileAttributes attributes = Files.readAttributes(lockPath, BasicFileAttributes.class,
-					LinkOption.NOFOLLOW_LINKS);
-			if (!attributes.isRegularFile() || attributes.isSymbolicLink() || attributes.size() != 0) {
-				throw new IOException("Invalid reminder ownership file");
-			}
-		} catch (NoSuchFileException absent) {
-			// Create only this fixed empty metadata file inside the checked data directory.
-		}
-		Set<OpenOption> options = Set.of(StandardOpenOption.CREATE, StandardOpenOption.WRITE,
-				LinkOption.NOFOLLOW_LINKS);
-		FileChannel channel = Files.getFileAttributeView(directory, PosixFileAttributeView.class,
-				LinkOption.NOFOLLOW_LINKS) == null ? FileChannel.open(lockPath, options)
-				: FileChannel.open(lockPath, options,
-						PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-------")));
-		boolean acquired = false;
-		try {
-			if (channel.size() != 0) throw new IOException("Invalid reminder ownership file");
-			FileLock candidate;
-			try {
-				candidate = channel.tryLock();
-			} catch (OverlappingFileLockException busy) {
-				return false;
-			}
-			if (candidate == null) return false;
-			leaseChannel = channel;
-			lease = candidate;
-			acquired = true;
-			return true;
-		} finally {
-			if (!acquired) channel.close();
-		}
-	}
-
-	/** Closing the channel releases its lock; keep the fixed lock file for successors. */
-	public void releaseLease() throws IOException {
-		FileChannel channel = leaseChannel;
-		leaseChannel = null;
-		lease = null;
-		if (channel != null) channel.close();
-	}
-
-	/** Returns null only when the record is absent from a valid existing directory. */
-	public Snapshot load() throws IOException {
-		validateDirectory();
-		try {
-			return readRecord(target);
-		} catch (NoSuchFileException absent) {
-			// A missing/replaced data directory is a failure, not an absent checkpoint.
-			validateDirectory();
-			if (Files.notExists(target, LinkOption.NOFOLLOW_LINKS)) {
-				return null;
-			}
-			throw absent;
-		}
-	}
-
-	/**
-	 * Publish a checked same-directory staged record using DurableFiles. Existing
-	 * invalid or unreadable records block replacement. PublishedException propagates
-	 * unchanged: the new record may already be visible, so no rollback is attempted.
-	 */
-	public void save(Snapshot snapshot) throws IOException {
-		Objects.requireNonNull(snapshot, "snapshot");
-		load();
-		Path staged = createStagedFile();
-		Throwable failure = null;
-		try {
-			ByteBuffer record = ByteBuffer.wrap(encode(snapshot));
-			try (FileChannel channel = FileChannel.open(staged, StandardOpenOption.WRITE,
-					StandardOpenOption.TRUNCATE_EXISTING, LinkOption.NOFOLLOW_LINKS)) {
-				while (record.hasRemaining()) {
-					if (channel.write(record) <= 0) {
-						throw new IOException("Could not write reminder checkpoint");
-					}
-				}
-			}
-			if (!snapshot.equals(readRecord(staged))) {
-				throw new IOException("Staged reminder checkpoint did not match");
-			}
-			// Recheck after staging, before replacing any existing destination.
-			load();
-			publisher.publish(staged, target);
-		} catch (IOException | RuntimeException | Error primary) {
-			failure = primary;
-			throw primary;
-		} finally {
-			try {
-				Files.deleteIfExists(staged);
-			} catch (IOException | RuntimeException cleanup) {
-				if (failure != null) {
-					failure.addSuppressed(cleanup);
-				} else {
-					throw new DurableFiles.PublishedException(cleanup instanceof IOException io ? io
-							: new IOException("Reminder staging cleanup failed after publication", cleanup));
-				}
-			}
-		}
-	}
-
-	private void validateDirectory() throws IOException {
-		BasicFileAttributes attributes = Files.readAttributes(directory, BasicFileAttributes.class,
-				LinkOption.NOFOLLOW_LINKS);
-		if (!attributes.isDirectory() || attributes.isSymbolicLink()) {
-			throw new IOException("Reminder data directory must be an existing directory");
-		}
-	}
-
-	private Path createStagedFile() throws IOException {
-		if (Files.getFileAttributeView(directory, PosixFileAttributeView.class, LinkOption.NOFOLLOW_LINKS) != null) {
-			return Files.createTempFile(directory, ".auto-create-sites-reminder-", ".tmp",
-					PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rw-------")));
-		}
-		return Files.createTempFile(directory, ".auto-create-sites-reminder-", ".tmp");
-	}
-
-	private static Snapshot readRecord(Path recordPath) throws IOException {
-		BasicFileAttributes attributes = Files.readAttributes(recordPath, BasicFileAttributes.class,
-				LinkOption.NOFOLLOW_LINKS);
-		if (!attributes.isRegularFile() || attributes.isSymbolicLink() || attributes.size() != RECORD_BYTES) {
-			throw new IOException("Invalid reminder checkpoint file");
-		}
-		ByteBuffer record = ByteBuffer.allocate(RECORD_BYTES);
-		try (FileChannel channel = FileChannel.open(recordPath, StandardOpenOption.READ, LinkOption.NOFOLLOW_LINKS)) {
-			if (channel.size() != RECORD_BYTES) {
-				throw new IOException("Invalid reminder checkpoint length");
-			}
-			while (record.hasRemaining()) {
-				if (channel.read(record) <= 0) {
-					throw new IOException("Incomplete reminder checkpoint");
-				}
-			}
-			if (channel.size() != RECORD_BYTES || channel.read(ByteBuffer.allocate(1)) != -1) {
-				throw new IOException("Trailing reminder checkpoint data");
-			}
-		}
-		return decode(record.array());
-	}
-
-	private static byte[] encode(Snapshot snapshot) {
-		ByteBuffer record = ByteBuffer.allocate(RECORD_BYTES).order(ByteOrder.BIG_ENDIAN);
-		record.put(MAGIC).putLong(snapshot.totalRuntimeMillis()).putLong(snapshot.lastReminderRuntimeMillis());
-		record.put(digest(Arrays.copyOf(record.array(), HEADER_BYTES)));
-		return record.array();
-	}
-
-	private static Snapshot decode(byte[] record) throws IOException {
-		if (!Arrays.equals(MAGIC, Arrays.copyOf(record, MAGIC.length))) {
-			throw new IOException("Invalid reminder checkpoint schema");
-		}
-		byte[] expected = digest(Arrays.copyOf(record, HEADER_BYTES));
-		if (!MessageDigest.isEqual(expected, Arrays.copyOfRange(record, HEADER_BYTES, RECORD_BYTES))) {
-			throw new IOException("Invalid reminder checkpoint checksum");
-		}
-		ByteBuffer header = ByteBuffer.wrap(record).order(ByteOrder.BIG_ENDIAN);
-		header.position(MAGIC.length);
-		try {
-			return new Snapshot(header.getLong(), header.getLong());
-		} catch (IllegalArgumentException invalid) {
-			throw new IOException("Invalid reminder checkpoint counters", invalid);
-		}
-	}
-
-	private static byte[] digest(byte[] header) {
-		try {
-			return MessageDigest.getInstance("SHA-256").digest(header);
-		} catch (NoSuchAlgorithmException unavailable) {
-			throw new IllegalStateException("SHA-256 is unavailable", unavailable);
-		}
-	}
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/npc/VotingNPCCommands.java

@@ -0,0 +1,119 @@
+package com.bencodez.votingplugin.npc;
+
+import java.util.Arrays;
+import java.util.UUID;
+import java.util.concurrent.CompletionStage;
+
+import org.bukkit.Location;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+import com.bencodez.advancedcore.api.command.CommandHandler;
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.util.BukkitCompletionScheduler;
+
+/** Normal /av command handlers; no separate command map or player GUI registry. */
+public final class VotingNPCCommands {
+    private static final String PERMISSION = "VotingPlugin.Commands.AdminVote.NPC";
+    private VotingNPCCommands() { }
+
+    public static void register(VotingPluginMain plugin) {
+        add(plugin, new String[] { "NPC", "Create", "(string)" }, false);
+        add(plugin, new String[] { "NPC", "Create", "(string)", "(list)" }, false);
+        add(plugin, new String[] { "NPC", "List" }, true);
+        add(plugin, new String[] { "NPC", "Inspect", "(npcid)" }, true);
+        add(plugin, new String[] { "NPC", "Remove", "(npcid)" }, true);
+    }
+
+    private static void add(VotingPluginMain plugin, String[] pattern, boolean console) {
+        plugin.getAdminVoteCommand().add(new CommandHandler(plugin, pattern, PERMISSION + "|VotingPlugin.Admin",
+                "Manage saved vanilla voting NPCs", console) {
+            @Override public void execute(CommandSender sender, String[] args) {
+                // CommandHandler invokes execute asynchronously. Capture location,
+                // permission and messages only after reaching the sender's owner.
+                String[] captured = args.clone();
+                onSender(plugin, sender, () -> executeOwned(plugin, sender, captured));
+            }
+        });
+    }
+
+    private static boolean allowed(CommandSender sender) {
+        return (!(sender instanceof Player player) || player.isOnline())
+                && (sender.hasPermission(PERMISSION) || sender.hasPermission("VotingPlugin.Admin"));
+    }
+
+    private static void onSender(VotingPluginMain plugin, CommandSender sender, Runnable action) {
+        Player player = sender instanceof Player candidate ? candidate : null;
+        BukkitCompletionScheduler.run(plugin, player, action, player == null ? action : () -> { }, () -> { });
+    }
+
+    private static void executeOwned(VotingPluginMain plugin, CommandSender sender, String[] args) {
+        if (!allowed(sender)) return;
+        VotingNPCManager manager = plugin.getVotingNPCManager();
+        if (manager == null || !manager.available()) {
+            sender.sendMessage("Voting NPCs are disabled, unsupported, or waiting for valid storage. Check VotingNPCs.Enabled in Config.yml and reload.");
+            return;
+        }
+        switch (args[1].toLowerCase(java.util.Locale.ROOT)) {
+        case "create":
+            if (!(sender instanceof Player player)) { sender.sendMessage("Create a voting NPC from in game."); return; }
+            try {
+                Location at = player.getLocation();
+                String name = args.length > 3 ? String.join(" ", Arrays.copyOfRange(args, 3, args.length)) : "&aVote";
+                VotingNPCDefinition definition = new VotingNPCDefinition(args[2], UUID.randomUUID(), at.getWorld().getUID(),
+                        at.getX(), at.getY(), at.getZ(), at.getYaw(), at.getPitch(), name);
+                confirm(plugin, sender, manager, manager.create(definition),
+                        ignored -> "Saved voting NPC '" + definition.id() + "'. Its villager appears when the area is loaded and available.");
+            } catch (IllegalArgumentException invalid) {
+                sender.sendMessage("Use a lowercase ID of 1-40 letters, digits, underscores or hyphens, and a name of 1-128 characters without controls.");
+            }
+            break;
+        case "remove":
+            confirm(plugin, sender, manager, manager.remove(args[2]), removed -> removed
+                    ? "Removed saved voting NPC '" + args[2] + "'; exact entity cleanup has been requested."
+                    : "No voting NPC has that ID.");
+            break;
+        case "inspect":
+            manager.definitions().stream().filter(value -> value.id().equals(args[2])).findFirst().ifPresentOrElse(value ->
+                    sender.sendMessage("Voting NPC " + value.id() + ": world " + value.world() + ", "
+                            + value.x() + ", " + value.y() + ", " + value.z() + "; " + manager.runtimeState(value.id())),
+                    () -> sender.sendMessage("No voting NPC has that ID."));
+            break;
+        case "list":
+            sender.sendMessage("Saved voting NPCs: " + manager.definitions().size() + "/64; tracked runtime slots: " + manager.runtimeCount());
+            for (var value : manager.definitions()) sender.sendMessage(value.id() + ": " + manager.runtimeState(value.id()));
+            break;
+        default:
+            sender.sendMessage("Use /av npc create <id> [name], list, inspect <id>, or remove <id>.");
+        }
+    }
+
+    private static String failureMessage(VotingNPCManager manager, Throwable failure) {
+        while ((failure instanceof java.util.concurrent.CompletionException
+                || failure instanceof java.util.concurrent.ExecutionException) && failure.getCause() != null) {
+            failure = failure.getCause();
+        }
+        if (manager.available()) {
+            if (failure instanceof VotingNPCRegistry.ValidationFailure validation) {
+                return switch (validation.reason) {
+                case DUPLICATE_ID -> "That voting NPC ID already exists. Use a different ID or remove it first.";
+                case DUPLICATE_IDENTITY -> "That voting NPC identity already exists. No definition was changed.";
+                case LIMIT -> "The 64 voting NPC limit has been reached. Remove an NPC before creating another.";
+                };
+            }
+            if (failure instanceof java.util.concurrent.RejectedExecutionException) {
+                return "Voting NPC storage is busy. Wait for pending changes to finish before retrying.";
+            }
+        }
+        return "Voting NPC change was not confirmed. Check storage and reload before retrying; no success is assumed.";
+    }
+
+    private static <T> void confirm(VotingPluginMain plugin, CommandSender sender, VotingNPCManager manager, CompletionStage<T> completion,
+            java.util.function.Function<T, String> message) {
+        completion.whenComplete((value, failure) -> onSender(plugin, sender, () -> {
+            if (!allowed(sender)) return;
+            sender.sendMessage(failure == null ? message.apply(value)
+                    : failureMessage(manager, failure));
+        }));
+    }
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/npc/VotingNPCDefinition.java

@@ -0,0 +1,29 @@
+package com.bencodez.votingplugin.npc;
+
+import java.util.Objects;
+import java.util.UUID;
+import java.util.regex.Pattern;
+
+/** Durable definition; it contains no live world, player, entity or reward state. */
+public record VotingNPCDefinition(String id, UUID identity, UUID world, double x, double y, double z,
+        float yaw, float pitch, String name) {
+    private static final Pattern ID = Pattern.compile("[a-z0-9][a-z0-9_-]{0,39}");
+
+    public VotingNPCDefinition {
+        if (id == null || !ID.matcher(id).matches()) throw new IllegalArgumentException("Invalid voting NPC ID");
+        Objects.requireNonNull(identity, "identity");
+        Objects.requireNonNull(world, "world");
+        if (!Double.isFinite(x) || !Double.isFinite(y) || !Double.isFinite(z)
+                || Math.abs(x) > 30_000_000 || Math.abs(z) > 30_000_000
+                || !Float.isFinite(yaw) || !Float.isFinite(pitch)) {
+            throw new IllegalArgumentException("Invalid voting NPC position");
+        }
+        if (name == null || name.isEmpty() || name.length() > 128
+                || name.codePoints().anyMatch(Character::isISOControl)) {
+            throw new IllegalArgumentException("Invalid voting NPC name");
+        }
+    }
+
+    public int chunkX() { return Math.floorDiv((int) Math.floor(x), 16); }
+    public int chunkZ() { return Math.floorDiv((int) Math.floor(z), 16); }
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/npc/VotingNPCManager.java

@@ -0,0 +1,450 @@
+package com.bencodez.votingplugin.npc;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.World;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Villager;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityCombustEvent;
+import org.bukkit.event.entity.EntityDamageEvent;
+import org.bukkit.event.entity.EntityInteractEvent;
+import org.bukkit.event.entity.EntityTargetEvent;
+import org.bukkit.event.entity.EntityTeleportEvent;
+import org.bukkit.event.entity.EntityTransformEvent;
+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.vehicle.VehicleEnterEvent;
+import org.bukkit.event.world.ChunkLoadEvent;
+import org.bukkit.event.world.ChunkUnloadEvent;
+import org.bukkit.event.world.WorldLoadEvent;
+import org.bukkit.event.world.WorldUnloadEvent;
+import org.bukkit.inventory.EquipmentSlot;
+
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.util.BukkitCompletionScheduler;
+
+/** Persistent definitions, transient public villagers, and no vote/reward accounting. */
+public final class VotingNPCManager implements Listener, AutoCloseable {
+    private final VotingPluginMain plugin;
+    private final VotingNPCScheduler scheduler;
+    private final Consumer<Player> open;
+    private final Map<String, RuntimeNPC> resources = new ConcurrentHashMap<>();
+    private final Set<String> capacityDemand = ConcurrentHashMap.newKeySet();
+    private final AtomicBoolean capacityWakeQueued = new AtomicBoolean();
+    private final Map<UUID, RuntimeNPC> entities = new ConcurrentHashMap<>();
+    private final Set<ChunkKey> unloadingChunks = ConcurrentHashMap.newKeySet();
+    private final Set<UUID> unloadingWorlds = ConcurrentHashMap.newKeySet();
+    private final Map<UUID, Long> recentClicks = new LinkedHashMap<>();
+    private volatile VotingNPCRegistry registry;
+    private volatile boolean enabled;
+    private volatile boolean closed;
+    private volatile long configuration;
+    private final AtomicBoolean warned = new AtomicBoolean();
+
+    private record ChunkKey(UUID world, int x, int z) { }
+    private static final class RuntimeNPC {
+        final VotingNPCDefinition definition;
+        final Location anchor;
+        final long configuration;
+        boolean closed, cleanupQueued, reconstructRequested;
+        Villager entity;
+        UUID entityId;
+        RuntimeNPC(VotingNPCDefinition definition, World world, long configuration) {
+            this.definition = definition;
+            this.configuration = configuration;
+            anchor = new Location(world, definition.x(), definition.y(), definition.z(), definition.yaw(), definition.pitch());
+        }
+    }
+
+    public VotingNPCManager(VotingPluginMain plugin) {
+        this(plugin, new VotingNPCScheduler(plugin), null, player -> openVotingSites(plugin, player));
+    }
+
+    static void openVotingSites(VotingPluginMain plugin, Player player) {
+        // Reuse the normal command's permissions, asynchronous user loading,
+        // configured GUI, cooldown display, and URL handling; no root alias.
+        for (var handler : plugin.getVoteCommand()) {
+            if (handler.runCommand(player, new String[] { "URL" })) return;
+        }
+        player.sendMessage("Voting-site selection is unavailable.");
+    }
+
+    VotingNPCManager(VotingPluginMain plugin, VotingNPCScheduler scheduler, VotingNPCRegistry registry, Consumer<Player> open) {
+        this.plugin = plugin;
+        this.scheduler = scheduler;
+        this.registry = registry;
+        this.open = open;
+    }
+
+    public static boolean supported() {
+        try {
+            Entity.class.getMethod("setPersistent", boolean.class);
+            Entity.class.getMethod("setGravity", boolean.class);
+            Entity.class.getMethod("setInvulnerable", boolean.class);
+            LivingEntity.class.getMethod("setAI", boolean.class);
+            LivingEntity.class.getMethod("setCollidable", boolean.class);
+            World.class.getMethod("spawn", Location.class, Class.class, Consumer.class);
+            return true;
+        } catch (ReflectiveOperationException | LinkageError unavailable) { return false; }
+    }
+
+    /** Configuration callers do no file I/O and do not wait for storage. */
+    public void configure(boolean requested) {
+        VotingNPCRegistry owner;
+        CompletionStage<List<VotingNPCDefinition>> loading;
+        long generation;
+        boolean activate;
+        synchronized (this) {
+            if (closed) return;
+            generation = ++configuration;
+            activate = requested && supported();
+            enabled = activate;
+            if (!activate) { owner = null; loading = null; }
+            else {
+                if (registry == null) {
+                    registry = new VotingNPCRegistry(plugin.getDataFolder().toPath().resolve("VotingNPCs.json"));
+                    loading = registry.initialLoad();
+                } else loading = registry.reload();
+                owner = registry;
+            }
+        }
+        if (!activate) {
+            for (RuntimeNPC npc : resources.values()) retire(npc);
+            if (requested) report(new IllegalStateException("Vanilla voting NPC API is unavailable"));
+            return;
+        }
+        loading.whenComplete((definitions, failure) -> {
+            synchronized (VotingNPCManager.this) {
+                if (closed || !enabled || generation != configuration || registry != owner) return;
+            }
+            if (failure != null) {
+                for (RuntimeNPC npc : resources.values()) retire(npc);
+                report(failure);
+            } else {
+                warned.set(false);
+                reconcile();
+            }
+        });
+    }
+
+    public boolean available() {
+        VotingNPCRegistry owner = registry;
+        return !closed && enabled && owner != null && owner.available();
+    }
+
+    public List<VotingNPCDefinition> definitions() {
+        VotingNPCRegistry owner = registry;
+        return owner == null ? List.of() : owner.snapshot();
+    }
+
+    /** Returns durable definition completion; runtime creation can still await a loaded chunk. */
+    public CompletionStage<VotingNPCDefinition> create(VotingNPCDefinition definition) {
+        VotingNPCRegistry owner = registry;
+        if (!available()) return CompletableFuture.failedFuture(new IllegalStateException("Enable VotingNPCs and load valid storage first"));
+        CompletionStage<VotingNPCDefinition> completion = owner.create(definition);
+        completion.whenComplete((value, failure) -> mutationFinished(owner, failure));
+        return completion;
+    }
+
+    public CompletionStage<Boolean> remove(String id) {
+        VotingNPCRegistry owner = registry;
+        if (!available()) return CompletableFuture.failedFuture(new IllegalStateException("Enable VotingNPCs and load valid storage first"));
+        CompletionStage<Boolean> completion = owner.remove(id);
+        completion.whenComplete((value, failure) -> mutationFinished(owner, failure));
+        return completion;
+    }
+
+    private void mutationFinished(VotingNPCRegistry owner, Throwable failure) {
+        if (owner != registry || closed) return;
+        if (failure == null) reconcile();
+        else if (!owner.available()) {
+            for (RuntimeNPC npc : resources.values()) retire(npc);
+            report(failure);
+        }
+    }
+
+    private boolean current(RuntimeNPC npc) {
+        return available() && definitions().contains(npc.definition);
+    }
+
+    private void reconcile() {
+        retryPendingCleanup();
+        capacityDemand.retainAll(definitions().stream().map(VotingNPCDefinition::id).toList());
+        List<VotingNPCDefinition> snapshot = definitions();
+        Set<ChunkKey> chunks = new HashSet<>();
+        Set<UUID> worlds = new HashSet<>();
+        for (var value : snapshot) { chunks.addAll(occupiedChunks(value)); worlds.add(value.world()); }
+        unloadingChunks.retainAll(chunks);
+        unloadingWorlds.retainAll(worlds);
+        for (RuntimeNPC npc : resources.values()) if (!current(npc)) retire(npc);
+        if (!available()) return;
+        scheduler.global(() -> {
+            if (!available()) return;
+            for (var value : definitions()) ensure(value);
+        }, this::report);
+    }
+
+    /** Same conservative half-block bounds used for creation ownership and chunk availability. */
+    private static Set<ChunkKey> occupiedChunks(VotingNPCDefinition value) {
+        Set<ChunkKey> chunks = new HashSet<>();
+        for (double dx : new double[] { -.5, .5 }) for (double dz : new double[] { -.5, .5 }) {
+            chunks.add(new ChunkKey(value.world(), (int) Math.floor(value.x() + dx) >> 4,
+                    (int) Math.floor(value.z() + dz) >> 4));
+        }
+        return chunks;
+    }
+    private boolean unloading(VotingNPCDefinition value) {
+        return occupiedChunks(value).stream().anyMatch(unloadingChunks::contains);
+    }
+
+    private void ensure(VotingNPCDefinition value) {
+        if (!available() || !definitions().contains(value) || unloadingWorlds.contains(value.world()) || unloading(value)) return;
+        World world = Bukkit.getWorld(value.world());
+        if (world == null) return;
+        RuntimeNPC npc = new RuntimeNPC(value, world, configuration);
+        RuntimeNPC previous;
+        synchronized (resources) {
+            previous = resources.get(value.id());
+            if (previous == null) {
+                if (resources.size() >= VotingNPCStore.MAX_NPCS) {
+                    if (capacityDemand.size() < VotingNPCStore.MAX_NPCS) capacityDemand.add(value.id());
+                    return;
+                }
+                resources.put(value.id(), npc);
+                capacityDemand.remove(value.id());
+            }
+        }
+        if (previous != null) {
+            synchronized (previous) { if (previous.closed) previous.reconstructRequested = true; }
+            return;
+        }
+        scheduler.region(npc.anchor, () -> spawn(npc), failure -> { retire(npc); report(failure); });
+    }
+
+    private boolean loadedArea(RuntimeNPC npc) {
+        World world = npc.anchor.getWorld();
+        if (Bukkit.getWorld(npc.definition.world()) != world || unloadingWorlds.contains(npc.definition.world())
+                || unloading(npc.definition)) return false;
+        for (double dx : new double[] { -.5, .5 }) for (double dz : new double[] { -.5, .5 }) {
+            Location edge = npc.anchor.clone().add(dx, 0, dz);
+            if (!scheduler.owns(edge) || !world.isChunkLoaded(edge.getBlockX() >> 4, edge.getBlockZ() >> 4)) return false;
+        }
+        return true;
+    }
+
+    private void spawn(RuntimeNPC npc) {
+        try {
+            synchronized (npc) {
+                if (npc.closed || !current(npc) || !loadedArea(npc)) {
+                    boolean capacityReleased = !npc.closed && !current(npc);
+                    forget(npc, capacityReleased);
+                    return;
+                }
+                if (npc.entity != null) return;
+                Villager spawned = npc.anchor.getWorld().spawn(npc.anchor, Villager.class, villager -> {
+                    npc.entity = villager;
+                    npc.entityId = villager.getUniqueId();
+                    entities.put(npc.entityId, npc);
+                    villager.setPersistent(false);
+                    villager.setAI(false);
+                    villager.setGravity(false);
+                    villager.setInvulnerable(true);
+                    villager.setSilent(true);
+                    villager.setCollidable(false);
+                    villager.setCanPickupItems(false);
+                    villager.setRemoveWhenFarAway(false);
+                    villager.setCustomName(ChatColor.translateAlternateColorCodes('&', npc.definition.name()));
+                    villager.setCustomNameVisible(true);
+                });
+                if (spawned != npc.entity || !spawned.isValid() || !current(npc) || npc.closed) {
+                    throw new IllegalStateException("Voting NPC spawn was cancelled or superseded");
+                }
+            }
+        } catch (RuntimeException | LinkageError failure) { retire(npc); report(failure); }
+    }
+
+    private void retire(RuntimeNPC npc) {
+        Villager entity;
+        synchronized (npc) {
+            npc.closed = true;
+            entity = npc.entity;
+            if (entity == null) { forget(npc, false); return; }
+            if (npc.cleanupQueued) return;
+            npc.cleanupQueued = true;
+        }
+        scheduler.entity(entity, () -> {
+            try { entity.remove(); forget(npc); }
+            catch (RuntimeException | LinkageError failure) { cleanupFailed(npc, failure); }
+        }, () -> forget(npc), failure -> cleanupFailed(npc, failure));
+    }
+
+    private void cleanupFailed(RuntimeNPC npc, Throwable failure) {
+        synchronized (npc) {
+            npc.cleanupQueued = false;
+            npc.reconstructRequested = true;
+        }
+        // Keep the exact identity and capacity reservation. Rejected scheduling
+        // is not successful removal and must not permit duplicate reconstruction.
+        report(failure);
+    }
+
+    private void retryPendingCleanup() {
+        for (RuntimeNPC npc : resources.values()) {
+            synchronized (npc) {
+                if (!npc.closed || !npc.reconstructRequested || npc.cleanupQueued || npc.entity == null) continue;
+            }
+            retire(npc);
+        }
+    }
+
+    private void forget(RuntimeNPC npc) { forget(npc, false); }
+
+    private void forget(RuntimeNPC npc, boolean capacityReleased) {
+        boolean reconstruct, removed;
+        synchronized (npc) {
+            reconstruct = npc.entity != null && (npc.reconstructRequested || npc.configuration != configuration
+                    || definitions().stream().anyMatch(value -> value.id().equals(npc.definition.id()) && !value.equals(npc.definition)));
+            if (npc.entityId != null) entities.remove(npc.entityId, npc);
+            npc.entity = null;
+            removed = resources.remove(npc.definition.id(), npc);
+        }
+        // A successor sharing this configured ID must wait for exact predecessor
+        // cleanup. Missing/unloaded spawn attempts do not recursively retry.
+        if (reconstruct && available()) scheduler.global(() -> {
+            for (var value : definitions()) if (value.id().equals(npc.definition.id())) ensure(value);
+        }, this::report);
+        if (removed && !capacityDemand.isEmpty() && available()
+                && capacityWakeQueued.compareAndSet(false, true)) {
+            scheduler.global(() -> {
+                capacityWakeQueued.set(false);
+                for (var value : definitions()) if (capacityDemand.contains(value.id())) ensure(value);
+            }, failure -> {
+                capacityWakeQueued.set(false);
+                report(failure);
+            });
+        }
+    }
+
+    private void report(Throwable failure) {
+        if (warned.compareAndSet(false, true)) {
+            try {
+                plugin.getLogger().warning("Voting NPCs could not complete an operation; definitions are retained. Check API support and VotingNPCs.json, then reload. Cause: "
+                        + failure.getClass().getSimpleName());
+            } catch (RuntimeException ignored) { /* Reporting must not prevent independent cleanup. */ }
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+    public void interact(PlayerInteractEntityEvent event) {
+        RuntimeNPC npc = entities.get(event.getRightClicked().getUniqueId());
+        if (npc == null) return;
+        boolean cancelled = event.isCancelled();
+        event.setCancelled(true); // Only this exact owned entity; never trading.
+        if (cancelled || event.getHand() != EquipmentSlot.HAND || !current(npc)) return;
+        synchronized (npc) { if (npc.closed) { retire(npc); return; } }
+        Player player = event.getPlayer();
+        long now = System.nanoTime();
+        synchronized (recentClicks) {
+            recentClicks.entrySet().removeIf(entry -> now - entry.getValue() >= 300_000_000L);
+            if (recentClicks.containsKey(player.getUniqueId()) || recentClicks.size() >= 256) return;
+            recentClicks.put(player.getUniqueId(), now);
+        }
+        BukkitCompletionScheduler.run(plugin, player, () -> {
+            if (!player.isOnline() || !current(npc) || !player.getWorld().getUID().equals(npc.definition.world())
+                    || player.getLocation().distanceSquared(npc.anchor) > 36) return;
+            synchronized (npc) { if (npc.closed) return; }
+            open.accept(player);
+        }, () -> { }, () -> { });
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+    public void interactAt(PlayerInteractAtEntityEvent event) { interact(event); }
+    private boolean owned(Entity entity) { return entity != null && entities.containsKey(entity.getUniqueId()); }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+    public void damage(EntityDamageEvent event) { if (owned(event.getEntity())) event.setCancelled(true); }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+    public void combust(EntityCombustEvent event) { if (owned(event.getEntity())) event.setCancelled(true); }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+    public void teleport(EntityTeleportEvent event) { if (owned(event.getEntity())) event.setCancelled(true); }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+    public void transform(EntityTransformEvent event) { if (owned(event.getEntity())) event.setCancelled(true); }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+    public void target(EntityTargetEvent event) { if (owned(event.getEntity()) || owned(event.getTarget())) event.setCancelled(true); }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+    public void blockInteract(EntityInteractEvent event) { if (owned(event.getEntity())) event.setCancelled(true); }
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
+    public void vehicle(VehicleEnterEvent event) { if (owned(event.getEntered())) event.setCancelled(true); }
+    @EventHandler public void quit(PlayerQuitEvent event) { synchronized (recentClicks) { recentClicks.remove(event.getPlayer().getUniqueId()); } }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void chunkLoad(ChunkLoadEvent event) {
+        UUID world = event.getWorld().getUID();
+        unloadingChunks.remove(new ChunkKey(world, event.getChunk().getX(), event.getChunk().getZ()));
+        retryPendingCleanup();
+        ChunkKey chunk = new ChunkKey(world, event.getChunk().getX(), event.getChunk().getZ());
+        for (var value : definitions()) if (occupiedChunks(value).contains(chunk)) ensure(value);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void chunkUnload(ChunkUnloadEvent event) {
+        ChunkKey chunk = new ChunkKey(event.getWorld().getUID(), event.getChunk().getX(), event.getChunk().getZ());
+        if (definitions().stream().noneMatch(value -> occupiedChunks(value).contains(chunk))) return;
+        unloadingChunks.add(chunk);
+        for (RuntimeNPC npc : resources.values()) if (occupiedChunks(npc.definition).contains(chunk)) retire(npc);
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR)
+    public void worldLoad(WorldLoadEvent event) {
+        UUID world = event.getWorld().getUID();
+        if (definitions().stream().noneMatch(value -> value.world().equals(world))) return;
+        unloadingWorlds.remove(world);
+        reconcile();
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void worldUnload(WorldUnloadEvent event) {
+        UUID world = event.getWorld().getUID();
+        if (definitions().stream().noneMatch(value -> value.world().equals(world))) return;
+        unloadingWorlds.add(world);
+        for (RuntimeNPC npc : resources.values()) if (npc.definition.world().equals(world)) retire(npc);
+    }
+
+    public int runtimeCount() { return resources.size(); }
+
+    public String runtimeState(String id) {
+        RuntimeNPC npc = resources.get(id);
+        if (npc == null) return "waiting for a loaded, available area";
+        synchronized (npc) {
+            if (npc.closed) return "cleanup pending";
+            return npc.entity == null ? "creation scheduled" : "villager created";
+        }
+    }
+
+    @Override public void close() {
+        synchronized (this) { if (closed) return; closed = true; enabled = false; ++configuration; }
+        VotingNPCRegistry owner = registry;
+        if (owner != null) owner.close();
+        for (RuntimeNPC npc : new ArrayList<>(resources.values())) retire(npc);
+        synchronized (recentClicks) { recentClicks.clear(); }
+    }
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/npc/VotingNPCRegistry.java

@@ -0,0 +1,206 @@
+package com.bencodez.votingplugin.npc;
+
+import java.io.IOException;
+import java.nio.channels.FileChannel;
+import java.nio.channels.FileLock;
+import java.nio.channels.OverlappingFileLockException;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * One bounded, daemon file owner. Completion means the definition was persisted,
+ * not that a world entity has spawned. Callbacks have no player/region ownership.
+ */
+final class VotingNPCRegistry implements AutoCloseable {
+    enum Rejection { DUPLICATE_ID, DUPLICATE_IDENTITY, LIMIT }
+    static final class ValidationFailure extends IllegalArgumentException {
+        private static final long serialVersionUID = 1L;
+        final Rejection reason;
+        ValidationFailure(Rejection reason) { super("Voting NPC request rejected"); this.reason = reason; }
+    }
+
+    private final Object admission = new Object();
+    private final ArrayBlockingQueue<Runnable> queue = new ArrayBlockingQueue<>(128);
+    private final CountDownLatch stopped = new CountDownLatch(1);
+    private final VotingNPCStore store;
+    private final Path lockPath;
+    private final CompletableFuture<List<VotingNPCDefinition>> initial;
+    private volatile Map<String, VotingNPCDefinition> definitions = Map.of();
+    private volatile boolean available;
+    private volatile boolean closed;
+    // Only the file worker accesses these resources.
+    private FileChannel lockChannel;
+    private FileLock lease;
+    private boolean storageReady;
+
+    VotingNPCRegistry(Path file) {
+        this(file, new VotingNPCStore(file));
+    }
+
+    VotingNPCRegistry(Path file, VotingNPCStore store) {
+        this.store = store;
+        lockPath = file.toAbsolutePath().normalize().resolveSibling(file.getFileName() + ".lock");
+        initial = submit(false, this::readDefinitions);
+        Thread thread = new Thread(this::work, "VotingPlugin-NPC-storage");
+        thread.setDaemon(true);
+        try { thread.start(); }
+        catch (RuntimeException | Error failure) {
+            closed = true;
+            initial.completeExceptionally(failure);
+            stopped.countDown();
+            throw failure;
+        }
+    }
+
+    CompletionStage<List<VotingNPCDefinition>> initialLoad() { return initial; }
+    boolean available() { return !closed && available; }
+    List<VotingNPCDefinition> snapshot() { return List.copyOf(definitions.values()); }
+
+    CompletionStage<List<VotingNPCDefinition>> reload() {
+        synchronized (admission) {
+            if (closed) return rejected("Voting NPC registry is closed");
+            var completion = submit(false, this::readDefinitions);
+            // A rejected reload changes nothing. The worker publishes readiness
+            // under this same short lock, after admission has finished.
+            if (!completion.isCompletedExceptionally()) available = false;
+            return completion;
+        }
+    }
+
+    CompletionStage<VotingNPCDefinition> create(VotingNPCDefinition definition) {
+        return submit(true, () -> {
+            if (definition == null) throw new IllegalArgumentException("Voting NPC definition is required");
+            if (definitions.containsKey(definition.id())) throw new ValidationFailure(Rejection.DUPLICATE_ID);
+            if (definitions.values().stream().anyMatch(value -> value.identity().equals(definition.identity()))) {
+                throw new ValidationFailure(Rejection.DUPLICATE_IDENTITY);
+            }
+            if (definitions.size() >= VotingNPCStore.MAX_NPCS) throw new ValidationFailure(Rejection.LIMIT);
+            var next = new LinkedHashMap<>(definitions);
+            next.put(definition.id(), definition);
+            publish(next);
+            return definition;
+        });
+    }
+
+    CompletionStage<Boolean> remove(String id) {
+        return submit(true, () -> {
+            if (!definitions.containsKey(id)) return false;
+            var next = new LinkedHashMap<>(definitions);
+            next.remove(id);
+            publish(next);
+            return true;
+        });
+    }
+
+    private List<VotingNPCDefinition> readDefinitions() throws IOException {
+        try {
+            ownFile();
+            List<VotingNPCDefinition> loaded = store.load();
+            var next = new LinkedHashMap<String, VotingNPCDefinition>();
+            for (VotingNPCDefinition value : loaded) next.put(value.id(), value);
+            definitions = java.util.Collections.unmodifiableMap(next);
+            storageReady = true;
+            synchronized (admission) { available = true; }
+            return loaded;
+        } catch (IOException | RuntimeException failure) {
+            storageReady = false;
+            synchronized (admission) { available = false; }
+            throw failure;
+        }
+    }
+
+    private void publish(LinkedHashMap<String, VotingNPCDefinition> next) throws IOException {
+        // The worker holds the process-independent lease through shutdown drain.
+        try { store.save(List.copyOf(next.values())); }
+        catch (IOException | RuntimeException | Error failure) {
+            // A failed write may already be visible. Neither later admitted
+            // mutations nor a new request may overwrite it from the old map.
+            storageReady = false;
+            synchronized (admission) { available = false; }
+            throw failure;
+        }
+        definitions = java.util.Collections.unmodifiableMap(next);
+    }
+
+    private <T> CompletableFuture<T> submit(boolean needsReady, Callable<T> action) {
+        synchronized (admission) {
+            if (closed || (needsReady && !available)) return rejected("Voting NPC storage is not available");
+            var completion = new CompletableFuture<T>();
+            Runnable task = () -> {
+                try {
+                    if (needsReady && !storageReady) throw new RejectedExecutionException("Reload valid voting NPC storage before editing");
+                    completion.complete(action.call());
+                }
+                catch (Throwable failure) { completion.completeExceptionally(failure); }
+            };
+            if (!queue.offer(task)) completion.completeExceptionally(new RejectedExecutionException("Voting NPC storage queue is full"));
+            return completion;
+        }
+    }
+
+    private static <T> CompletableFuture<T> rejected(String message) {
+        return CompletableFuture.failedFuture(new RejectedExecutionException(message));
+    }
+
+    private void ownFile() throws IOException {
+        if (lease != null && lease.isValid()) return;
+        if (!Files.isDirectory(lockPath.getParent().toRealPath(), LinkOption.NOFOLLOW_LINKS)) {
+            throw new IOException("Voting NPC data directory is unavailable");
+        }
+        FileChannel candidate = FileChannel.open(lockPath, StandardOpenOption.CREATE,
+                StandardOpenOption.WRITE, LinkOption.NOFOLLOW_LINKS);
+        try {
+            FileLock acquired;
+            try { acquired = candidate.tryLock(); }
+            catch (OverlappingFileLockException overlap) { throw new IOException("Voting NPC file still has an active owner", overlap); }
+            if (acquired == null) throw new IOException("Voting NPC file still has an active owner");
+            lockChannel = candidate;
+            lease = acquired;
+        } finally {
+            if (lockChannel != candidate) candidate.close();
+        }
+    }
+
+    private void work() {
+        try {
+            while (!closed || !queue.isEmpty()) {
+                Runnable task;
+                try { task = queue.take(); }
+                catch (InterruptedException interrupted) { continue; }
+                task.run();
+            }
+        } finally {
+            available = false;
+            try {
+                if (lockChannel != null) lockChannel.close();
+            } catch (IOException ignored) {
+                // Closing this channel releases its OS lease; never do this I/O
+                // under an admission or executor lock on a gameplay caller.
+            } finally { stopped.countDown(); }
+        }
+    }
+
+    /** Stops admission without blocking or interrupting an accepted file write. */
+    @Override public void close() {
+        synchronized (admission) {
+            if (closed) return;
+            closed = true;
+            queue.offer(() -> { }); // Wake an idle worker; a full queue already wakes it.
+        }
+    }
+
+    /** Test/owner-worker observation only; gameplay callers must never wait here. */
+    boolean awaitClosed(long time, TimeUnit unit) throws InterruptedException { return stopped.await(time, unit); }
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/npc/VotingNPCScheduler.java

@@ -0,0 +1,77 @@
+package com.bencodez.votingplugin.npc;
+
+import java.lang.reflect.Method;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+
+import com.bencodez.votingplugin.VotingPluginMain;
+import com.bencodez.votingplugin.util.BukkitCompletionScheduler;
+
+/** World creation uses a region; subsequent cleanup follows the actual entity. */
+class VotingNPCScheduler {
+    private final VotingPluginMain plugin;
+    private final Method locationOwner;
+    private final Method entityOwner;
+
+    VotingNPCScheduler(VotingPluginMain plugin) {
+        this.plugin = plugin;
+        Method location = null, entity = null;
+        try {
+            Class.forName("io.papermc.paper.threadedregions.RegionizedServer");
+            location = Bukkit.class.getMethod("isOwnedByCurrentRegion", Location.class);
+            entity = Bukkit.class.getMethod("isOwnedByCurrentRegion", Entity.class);
+        } catch (ClassNotFoundException ordinaryServer) {
+            // Spigot/Paper have a single world-owner thread.
+        } catch (ReflectiveOperationException unavailable) {
+            throw new IllegalStateException("Voting NPC region ownership API is unavailable", unavailable);
+        }
+        locationOwner = location;
+        entityOwner = entity;
+    }
+
+    boolean owns(Location location) { return owns(locationOwner, location); }
+    boolean owns(Entity entity) { return owns(entityOwner, entity); }
+
+    private boolean owns(Method method, Object value) {
+        if (method == null) return Bukkit.isPrimaryThread();
+        try { return Boolean.TRUE.equals(method.invoke(null, value)); }
+        catch (ReflectiveOperationException failure) { throw new IllegalStateException("Cannot verify voting NPC ownership", failure); }
+    }
+
+    void global(Runnable action, Consumer<Throwable> failure) {
+        try {
+            plugin.getBukkitScheduler().getFoliaLib().getImpl().runNextTick(ignored -> action.run())
+                    .whenComplete((ignored, failed) -> { if (failed != null) failure.accept(failed); });
+        } catch (RuntimeException | LinkageError rejected) { failure.accept(rejected); }
+    }
+
+    void region(Location anchor, Runnable action, Consumer<Throwable> failure) {
+        try {
+            if (owns(anchor)) action.run();
+            else plugin.getBukkitScheduler().getFoliaLib().getImpl().runAtLocation(anchor, ignored -> action.run())
+                    .whenComplete((ignored, failed) -> { if (failed != null) failure.accept(failed); });
+        } catch (RuntimeException | LinkageError rejected) { failure.accept(rejected); }
+    }
+
+    void entity(Entity entity, Runnable action, Runnable retired, Consumer<Throwable> failure) {
+        AtomicBoolean executed = new AtomicBoolean();
+        Runnable run = () -> { if (executed.compareAndSet(false, true)) action.run(); };
+        Runnable gone = () -> { if (executed.compareAndSet(false, true)) retired.run(); };
+        try {
+            if (owns(entity)) { run.run(); return; }
+            plugin.getBukkitScheduler().getFoliaLib().getImpl().runAtEntityWithFallback(entity,
+                    ignored -> run.run(), gone).whenComplete((status, failed) -> {
+                if (failed != null) failure.accept(failed);
+                else if (status instanceof Enum<?> result && "ENTITY_RETIRED".equals(result.name())) gone.run();
+                else if (!BukkitCompletionScheduler.isSuccessfulEntityTaskResult(status)) {
+                    // Scheduler retirement does not prove the entity was removed.
+                    failure.accept(new IllegalStateException("Voting NPC entity scheduler is unavailable"));
+                }
+            });
+        } catch (RuntimeException | LinkageError rejected) { failure.accept(rejected); }
+    }
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/npc/VotingNPCStore.java

@@ -0,0 +1,199 @@
+package com.bencodez.votingplugin.npc;
+
+import java.io.IOException;
+import java.io.StringReader;
+import java.nio.ByteBuffer;
+import java.nio.channels.FileChannel;
+import java.nio.charset.CharacterCodingException;
+import java.nio.charset.CodingErrorAction;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
+import com.google.gson.stream.JsonWriter;
+import com.bencodez.votingplugin.util.DurableFiles;
+
+/** Single storage-worker owner. Never call this file boundary on a gameplay thread. */
+class VotingNPCStore {
+    static final int MAX_NPCS = 64;
+    private static final int MAX_BYTES = 128 * 1024;
+    private static final Set<String> FIELDS = Set.of("id", "identity", "world", "x", "y", "z", "yaw", "pitch", "name");
+    private final Path file;
+    private boolean initialized;
+    private boolean uncertain;
+
+    VotingNPCStore(Path file) { this.file = file.toAbsolutePath().normalize(); }
+
+    synchronized List<VotingNPCDefinition> load() throws IOException {
+        initialized = false;
+        checkParent();
+        BasicFileAttributes attributes;
+        try { attributes = Files.readAttributes(file, BasicFileAttributes.class, LinkOption.NOFOLLOW_LINKS); }
+        catch (NoSuchFileException missing) {
+            if (uncertain) throw new IOException("Uncertain voting NPC definitions are missing", missing);
+            initialized = true;
+            return List.of();
+        }
+        if (!attributes.isRegularFile() || attributes.isSymbolicLink() || attributes.size() > MAX_BYTES) {
+            throw new IOException("Voting NPC definitions are not a bounded regular file");
+        }
+        byte[] bytes;
+        try (var input = Files.newInputStream(file, LinkOption.NOFOLLOW_LINKS)) {
+            bytes = input.readNBytes(MAX_BYTES + 1);
+        }
+        if (bytes.length > MAX_BYTES) throw new IOException("Voting NPC definitions exceed limit");
+        String text;
+        try { text = StandardCharsets.UTF_8.newDecoder().onMalformedInput(CodingErrorAction.REPORT)
+                .onUnmappableCharacter(CodingErrorAction.REPORT).decode(ByteBuffer.wrap(bytes)).toString(); }
+        catch (CharacterCodingException invalid) { throw new IOException("Invalid voting NPC encoding", invalid); }
+        List<VotingNPCDefinition> result = decode(text);
+        uncertain = false;
+        initialized = true;
+        return result;
+    }
+
+    synchronized void save(List<VotingNPCDefinition> definitions) throws IOException {
+        if (!initialized || uncertain) throw new IOException("Load valid voting NPC definitions before editing");
+        validate(definitions);
+        byte[] bytes = encode(definitions).getBytes(StandardCharsets.UTF_8);
+        if (bytes.length > MAX_BYTES) throw new IOException("Voting NPC definitions exceed limit");
+        checkParent();
+        if (Files.isSymbolicLink(file)) throw new IOException("Voting NPC definitions cannot be a symbolic link");
+        Path staged = Files.createTempFile(file.getParent(), ".voting-npcs-", ".tmp");
+        boolean published = false;
+        Throwable primary = null;
+        try {
+            try (FileChannel output = FileChannel.open(staged, StandardOpenOption.WRITE)) {
+                ByteBuffer buffer = ByteBuffer.wrap(bytes);
+                while (buffer.hasRemaining()) output.write(buffer);
+                output.force(true);
+            }
+            Files.move(staged, file, StandardCopyOption.ATOMIC_MOVE, StandardCopyOption.REPLACE_EXISTING);
+            published = true;
+            forceDirectory(file.getParent());
+        } catch (IOException | RuntimeException | Error failure) {
+            // A visible replacement followed by a failed directory sync is not a
+            // rollback. Fence later mutations rather than overwrite it from old state.
+            if (published) uncertain = true;
+            primary = failure;
+            throw failure;
+        } finally {
+            try { Files.deleteIfExists(staged); }
+            catch (IOException cleanupFailure) {
+                if (primary != null) primary.addSuppressed(cleanupFailure);
+                else {
+                    if (published) uncertain = true;
+                    throw cleanupFailure;
+                }
+            }
+        }
+    }
+
+    private void checkParent() throws IOException {
+        // Operators may place the data directory below a directory alias. Only
+        // the definitions and lease files themselves must remain non-links.
+        if (!Files.isDirectory(file.getParent().toRealPath(), LinkOption.NOFOLLOW_LINKS)) {
+            throw new IOException("Voting NPC data directory is unavailable");
+        }
+    }
+
+    /** Kept as a narrow I/O seam so failure-after-publication can be tested. */
+    void forceDirectory(Path directory) throws IOException {
+        DurableFiles.forceDirectory(directory);
+    }
+
+    private static void validate(List<VotingNPCDefinition> values) throws IOException {
+        if (values == null || values.size() > MAX_NPCS) throw new IOException("Voting NPC definition limit exceeded");
+        Set<String> ids = new HashSet<>();
+        Set<UUID> identities = new HashSet<>();
+        for (VotingNPCDefinition value : values) {
+            if (value == null || !ids.add(value.id()) || !identities.add(value.identity())) {
+                throw new IOException("Duplicate or missing voting NPC identity");
+            }
+        }
+    }
+
+    private static String encode(List<VotingNPCDefinition> values) throws IOException {
+        var text = new java.io.StringWriter();
+        try (JsonWriter writer = new JsonWriter(text)) {
+            writer.setIndent("  ");
+            writer.beginObject().name("version").value(1).name("npcs").beginArray();
+            for (VotingNPCDefinition value : values) {
+                writer.beginObject().name("id").value(value.id()).name("identity").value(value.identity().toString())
+                        .name("world").value(value.world().toString()).name("x").value(value.x()).name("y").value(value.y())
+                        .name("z").value(value.z()).name("yaw").value(value.yaw()).name("pitch").value(value.pitch())
+                        .name("name").value(value.name()).endObject();
+            }
+            writer.endArray().endObject();
+        }
+        return text.toString() + "\n";
+    }
+
+    private static List<VotingNPCDefinition> decode(String text) throws IOException {
+        try (JsonReader reader = new JsonReader(new StringReader(text))) {
+            Set<String> keys = new HashSet<>();
+            List<VotingNPCDefinition> values = null;
+            reader.beginObject();
+            while (reader.hasNext()) {
+                String key = reader.nextName();
+                if (!keys.add(key)) throw new IOException("Duplicate voting NPC document field");
+                if (key.equals("version")) {
+                    if (reader.peek() != JsonToken.NUMBER || !reader.nextString().equals("1")) {
+                        throw new IOException("Unsupported voting NPC document version");
+                    }
+                } else if (key.equals("npcs")) {
+                    values = new ArrayList<>();
+                    reader.beginArray();
+                    while (reader.hasNext()) {
+                        if (values.size() >= MAX_NPCS) throw new IOException("Voting NPC definition limit exceeded");
+                        values.add(readDefinition(reader));
+                    }
+                    reader.endArray();
+                } else throw new IOException("Unknown voting NPC document field");
+            }
+            reader.endObject();
+            if (!keys.equals(Set.of("version", "npcs")) || reader.peek() != JsonToken.END_DOCUMENT) {
+                throw new IOException("Incomplete or trailing voting NPC document");
+            }
+            validate(values);
+            return List.copyOf(values);
+        } catch (IllegalArgumentException | IllegalStateException invalid) {
+            throw new IOException("Invalid voting NPC definitions", invalid);
+        }
+    }
+
+    private static VotingNPCDefinition readDefinition(JsonReader reader) throws IOException {
+        var fields = new java.util.HashMap<String, String>();
+        reader.beginObject();
+        while (reader.hasNext()) {
+            String field = reader.nextName();
+            if (!FIELDS.contains(field) || fields.containsKey(field)) throw new IOException("Unknown or duplicate voting NPC field");
+            boolean numeric = Set.of("x", "y", "z", "yaw", "pitch").contains(field);
+            if (reader.peek() != (numeric ? JsonToken.NUMBER : JsonToken.STRING)) throw new IOException("Invalid voting NPC field type");
+            fields.put(field, reader.nextString());
+        }
+        reader.endObject();
+        if (!fields.keySet().equals(FIELDS)) throw new IOException("Missing voting NPC field");
+        return new VotingNPCDefinition(fields.get("id"), uuid(fields.get("identity")), uuid(fields.get("world")),
+                Double.parseDouble(fields.get("x")), Double.parseDouble(fields.get("y")), Double.parseDouble(fields.get("z")),
+                Float.parseFloat(fields.get("yaw")), Float.parseFloat(fields.get("pitch")), fields.get("name"));
+    }
+
+    private static UUID uuid(String text) {
+        UUID value = UUID.fromString(text);
+        if (!value.toString().equals(text)) throw new IllegalArgumentException("Noncanonical voting NPC identity");
+        return value;
+    }
+}

VotingPlugin/src/main/java/com/bencodez/votingplugin/placeholders/PlaceHolders.java

@@ -67,8 +67,6 @@ public class PlaceHolders {
 	private record PlatformUpdateKey(UUID uuid, PlaceHolder<VotingPluginUser> placeholder) { }
 	private final ConcurrentHashMap<PlatformUpdateKey, Long> platformUpdateGenerations = new ConcurrentHashMap<>();
 	private boolean userDataChangeListenerRegistered;
-	private final PointPlaceholderFence pointFence = new PointPlaceholderFence();
-	private final ConcurrentHashMap<UUID, Object> pointRecoveryWorkers = new ConcurrentHashMap<>();
 
 	@Getter
 	private PlaceholderCacheLevel cacheLevel;
@@ -132,8 +130,6 @@ public class PlaceHolders {
 	public String getPlaceHolder(OfflinePlayer p, String identifier1, boolean javascript) {
 		boolean forceProcess = false;
 		boolean useCache = true;
-        if (identifier1.regionMatches(true, 0, "DateVoteMilestones_", 0, "DateVoteMilestones_".length()))
-            return getPlaceholderValue(p, identifier1, false, true, false);
 		String identifier = identifier1.toLowerCase();
 		boolean custom = false;
 		if (identifier.endsWith("_process")
@@ -172,9 +168,7 @@ public class PlaceHolders {
 	 * @param identifier the placeholder identifier
 	 * @return the placeholder value
 	 */
-	public String getPlaceHolder(Player p, String identifier) {
-        if (identifier.regionMatches(true, 0, "DateVoteMilestones_", 0, "DateVoteMilestones_".length()))
-            return getPlaceholderValue(p, identifier, false, true, false);
+	public String getPlaceHolder(Player p, String identifier) {
 		if (plugin.getConfigFile().isUseJavascriptPlaceholders()) {
 			identifier = PlaceholderUtils.replaceJavascript(p, identifier);
 		}
@@ -191,118 +185,7 @@ public class PlaceHolders {
 	 * @return the placeholder value
 	 */
 	public String getPlaceholderValue(OfflinePlayer p, String identifier, boolean javascript, boolean forceProcess,
-			boolean useCache) {
-		if (p == null || !isPointIdentifier(identifier)) {
-			return getPlaceholderValueUnfenced(p, identifier, javascript, forceProcess, useCache);
-		}
-		VotingPluginUser pointUser = resolvePlaceholderUser(p);
-		UUID uuid = pointUser.getJavaUUID();
-		var generation = pointFence.generation(uuid);
-		try {
-			if (!pointFence.readable(uuid, generation)) {
-				if (pointFence.recoverable(uuid)) schedulePointRecovery(pointUser);
-				return "...";
-			}
-			if (com.bencodez.advancedcore.api.user.UserStorage.MYSQL.equals(plugin.getStorageType())) {
-				var snapshot = publishedPointSnapshot(pointUser);
-				if (snapshot == null) {
-					schedulePointRecovery(pointUser);
-					return "...";
-				}
-				// A complete row with invalid data is unavailable, not a missing snapshot to reload.
-				if (pointBalance(snapshot, pointUser.getPointsPath()) == null) return "...";
-			}
-			String value = getPlaceholderValueUnfenced(p, identifier, javascript, forceProcess, useCache);
-			return pointFence.readable(uuid, generation) ? value : "...";
-		} finally {
-			pointFence.release(uuid);
-		}
-	}
-
-	/**
-	 * Snapshot-only point balance for direct API users on Bukkit/Folia threads.
-	 * A pending/uncertain debit or incomplete publication is unavailable, not
-	 * a genuine zero. This shares the same mutation fence as point placeholders.
-	 *
-	 * @param user the requested user
-	 * @return a published point balance, or empty until it is safe to read
-	 */
-	public java.util.OptionalInt getPointBalanceIfReady(VotingPluginUser user) {
-		if (user == null || !plugin.isEnabled() || plugin.getPlaceholders() != this) {
-			return java.util.OptionalInt.empty();
-		}
-		UUID uuid = user.getJavaUUID();
-		var generation = pointFence.generation(uuid);
-		try {
-			if (!pointFence.readable(uuid, generation)) {
-				if (pointFence.recoverable(uuid)) schedulePointRecovery(user);
-				return java.util.OptionalInt.empty();
-			}
-			var snapshot = publishedPointSnapshot(user);
-			if (snapshot == null) {
-				schedulePointRecovery(user);
-				return java.util.OptionalInt.empty();
-			}
-			Integer amount = pointBalance(snapshot, user.getPointsPath());
-			if (amount == null || !pointFence.readable(uuid, generation)) {
-				return java.util.OptionalInt.empty();
-			}
-			return java.util.OptionalInt.of(amount);
-		} finally {
-			pointFence.release(uuid);
-		}
-	}
-
-	private java.util.Map<String, com.bencodez.simpleapi.sql.data.DataValue> publishedPointSnapshot(VotingPluginUser user) {
-		var cache = plugin.getUserManager().getDataManager().getUserDataCache().get(user.getJavaUUID());
-		return cache == null ? null : cache.snapshotIfPublished();
-	}
-
-	private Integer pointBalance(VotingPluginUser user) {
-		if (!com.bencodez.advancedcore.api.user.UserStorage.MYSQL.equals(plugin.getStorageType())) return user.getPoints();
-		return pointBalance(publishedPointSnapshot(user), user.getPointsPath());
-	}
-
-	private Integer pointBalance(java.util.Map<String, com.bencodez.simpleapi.sql.data.DataValue> snapshot, String column) {
-		if (snapshot == null) return null;
-		// AC publishes a complete row; absence has the historical integer default.
-		if (!snapshot.containsKey(column)) return 0;
-		var value = snapshot.get(column);
-		if (value == null) return null;
-		try {
-			if (value.isInt()) return value.getInt();
-			if (value.isString()) return Integer.valueOf(value.getString());
-		} catch (NumberFormatException malformed) {
-			return null;
-		}
-		return null;
-	}
-
-	private void schedulePointRecovery(VotingPluginUser user) {
-		schedulePlaceholderCheck(user);
-	}
-
-	private static boolean isPointIdentifier(String identifier) {
-		String key = identifier.toLowerCase(Locale.ROOT);
-		return key.equals("points") || key.equals("points_format") || key.startsWith("enoughpoints_");
-	}
-
-	private String getPlaceholderValueUnfenced(OfflinePlayer p, String identifier, boolean javascript, boolean forceProcess,
 			boolean useCache) {
-        // This family owns a bounded snapshot cache and preserves case-sensitive event IDs.
-        // Bypass legacy cache enrollment/name resolution, which can perform storage work.
-        String datePrefix = "DateVoteMilestones_";
-        if (identifier.regionMatches(true, 0, datePrefix, 0, datePrefix.length())) {
-            if (p == null) return "no player";
-            var manager = plugin.getDateVoteMilestones();
-            if (manager == null) return "unavailable";
-            if (p instanceof Player online) {
-                UUID storageId = plugin.getPlaceholderPlayerPresence().storageUuid(online);
-                return storageId == null ? "unavailable" : manager.placeholder(storageId, identifier.substring(datePrefix.length()));
-            }
-            UUID playerId = p.getUniqueId();
-            return playerId == null ? "unavailable" : manager.placeholder(playerId, p::getName, identifier.substring(datePrefix.length()));
-        }
 		if (plugin.getConfigFile().isUseJavascriptPlaceholders() && javascript && p != null) {
 			identifier = PlaceholderUtils.replaceJavascript(p, identifier);
 		}
@@ -322,12 +205,6 @@ public class PlaceHolders {
 			return "no player";
 		}
 
-		// These ranks use bounded snapshot projections; persistent result caches outlive presence evidence.
-		if (plugin.getConfigFile().isHideTopVoterIfNotPlayedBefore() && switch (identifier.toLowerCase(Locale.ROOT)) {
-			case "top_all_position", "top_month_position", "top_lastmonth_position", "top_week_position",
-					"top_daily_position" -> true;
-			default -> false;
-		}) useCache = false;
 		VotingPluginUser user = resolvePlaceholderUser(p);
 		if (useCache) {
 			if (!cachedPlaceholders.contains(identifier)) {
@@ -543,14 +420,6 @@ public class PlaceHolders {
 			}
 		}.withDescription("Best monthly total").updateDataKey("HighestMonthlyTotal"));
 
-        placeholders.add(new PlaceHolder<VotingPluginUser>("DateVoteMilestones_") {
-            @Override public String placeholderRequest(VotingPluginUser user, String identifier) {
-                var manager = plugin.getDateVoteMilestones();
-                return manager == null || user == null ? "unavailable"
-                        : manager.placeholder(user.getJavaUUID(), identifier.substring("DateVoteMilestones_".length()));
-            }
-        }.withDescription("Date event votes/next/status/award snapshots; loading and unavailable are distinct").useStartsWith());
-
 		placeholders.add(new PlaceHolder<VotingPluginUser>("DailyVoteStreak") {
 
 			@Override
@@ -623,8 +492,7 @@ public class PlaceHolders {
 
 			@Override
 			public String placeholderRequest(VotingPluginUser user, String identifier) {
-				Integer points = pointBalance(user);
-				return points == null ? "..." : Integer.toString(points);
+				return Integer.toString(user.getPoints());
 			}
 		}.withDescription("User points").updateDataKey("Points"));
 
@@ -633,8 +501,7 @@ public class PlaceHolders {
 			@Override
 			public String placeholderRequest(VotingPluginUser user, String identifier) {
 				NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);
-				Integer points = pointBalance(user);
-				return points == null ? "..." : numberFormat.format(points);
+				return numberFormat.format(user.getPoints());
 			}
 		}.withDescription("User points").updateDataKey("Points"));
 
@@ -742,7 +609,7 @@ public class PlaceHolders {
 			public String placeholderRequest(VotingPluginUser user, String identifier) {
 				int num = 1;
 				UUID toMatch = UUID.fromString(user.getUUID());
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.AllTime).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
 					if (entry.getKey().getUuid().equals(toMatch)) {
 						return "" + num;
 					}
@@ -760,9 +627,7 @@ public class PlaceHolders {
 					return "invalid";
 				}
 				int number = Integer.parseInt(identifier.split("_")[1]);
-				Integer points = pointBalance(user);
-				if (points == null) return "...";
-				if (points >= number) {
+				if (user.getPoints() >= number) {
 					return "true";
 				}
 				return "false";
@@ -840,7 +705,7 @@ public class PlaceHolders {
 			public String placeholderRequest(String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.AllTime).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
 					if (num == number) {
 						return "" + entry.getValue().intValue();
 					}
@@ -859,7 +724,7 @@ public class PlaceHolders {
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.AllTime).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
 					if (num == number) {
 						return entry.getKey().getPlayerName();
 					}
@@ -875,7 +740,7 @@ public class PlaceHolders {
 			public String placeholderRequest(VotingPluginUser user, String identifier) {
 				int num = 1;
 				UUID toMatch = UUID.fromString(user.getUUID());
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Monthly).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
 					if (entry.getKey().getUuid().equals(toMatch)) {
 						return "" + num;
 					}
@@ -892,7 +757,7 @@ public class PlaceHolders {
 				public String placeholderRequest(VotingPluginUser user, String identifier) {
 					int num = 1;
 					UUID toMatch = UUID.fromString(user.getUUID());
-					for (Entry<TopVoterPlayer, Integer> entry : plugin.getLastMonthTopVoterDisplay().entrySet()) {
+					for (Entry<TopVoterPlayer, Integer> entry : plugin.getLastMonthTopVoter().entrySet()) {
 						if (entry.getKey().getUuid().equals(toMatch)) {
 							return "" + num;
 						}
@@ -910,7 +775,7 @@ public class PlaceHolders {
 					}
 					int num = 1;
 					int number = Integer.parseInt(identifier.split("_")[2]);
-					for (Entry<TopVoterPlayer, Integer> entry : plugin.getLastMonthTopVoterDisplay().entrySet()) {
+					for (Entry<TopVoterPlayer, Integer> entry : plugin.getLastMonthTopVoter().entrySet()) {
 						if (num == number) {
 							return entry.getKey().getPlayerName();
 						}
@@ -926,7 +791,7 @@ public class PlaceHolders {
 				public String placeholderRequest(String identifier) {
 					int num = 1;
 					int number = Integer.parseInt(identifier.split("_")[2]);
-					for (Entry<TopVoterPlayer, Integer> entry : plugin.getLastMonthTopVoterDisplay().entrySet()) {
+					for (Entry<TopVoterPlayer, Integer> entry : plugin.getLastMonthTopVoter().entrySet()) {
 						if (num == number) {
 							return "" + entry.getValue().intValue();
 						}
@@ -947,7 +812,7 @@ public class PlaceHolders {
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Monthly).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
 					if (num == number) {
 						return entry.getKey().getPlayerName();
 					}
@@ -963,7 +828,7 @@ public class PlaceHolders {
 			public String placeholderRequest(String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Monthly).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
 					if (num == number) {
 						return "" + entry.getValue().intValue();
 					}
@@ -979,7 +844,7 @@ public class PlaceHolders {
 			public String placeholderRequest(VotingPluginUser user, String identifier) {
 				int num = 1;
 				UUID toMatch = UUID.fromString(user.getUUID());
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Weekly).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
 					if (entry.getKey().getUuid().equals(toMatch)) {
 						return "" + num;
 					}
@@ -998,7 +863,7 @@ public class PlaceHolders {
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Weekly).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
 					if (num == number) {
 						return entry.getKey().getPlayerName();
 					}
@@ -1014,7 +879,7 @@ public class PlaceHolders {
 			public String placeholderRequest(String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Weekly).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
 					if (num == number) {
 						return "" + entry.getValue().intValue();
 					}
@@ -1030,7 +895,7 @@ public class PlaceHolders {
 			public String placeholderRequest(VotingPluginUser user, String identifier) {
 				int num = 1;
 				UUID toMatch = UUID.fromString(user.getUUID());
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Daily).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
 					if (entry.getKey().getUuid().equals(toMatch)) {
 						return "" + num;
 					}
@@ -1049,7 +914,7 @@ public class PlaceHolders {
 				}
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Daily).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
 					if (num == number) {
 						return entry.getKey().getPlayerName();
 					}
@@ -1073,7 +938,7 @@ public class PlaceHolders {
 			public String placeholderRequest(String identifier) {
 				int num = 1;
 				int number = Integer.parseInt(identifier.split("_")[2]);
-				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Daily).entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
 					if (num == number) {
 						return "" + entry.getValue().intValue();
 					}
@@ -1089,7 +954,7 @@ public class PlaceHolders {
 
 			@Override
 			public String placeholderRequest(String identifier) {
-				return Integer.toString(plugin.getServerData().getVotePartyDisplay().total());
+				return Integer.toString(plugin.getVoteParty().getTotalVotes());
 			}
 		}.withDescription("Current amount of voteparty votes"));
 
@@ -1097,8 +962,7 @@ public class PlaceHolders {
 
 			@Override
 			public String placeholderRequest(String identifier) {
-				return Integer.toString(plugin.getServerData().getVotePartyDisplay()
-						.needed(plugin.getSpecialRewardsConfig().getVotePartyVotesRequired()));
+				return Integer.toString(plugin.getVoteParty().getNeededVotes());
 			}
 		}.withDescription("Voteparty votes needed"));
 
@@ -1106,8 +970,7 @@ public class PlaceHolders {
 
 			@Override
 			public String placeholderRequest(String identifier) {
-				return Integer.toString(plugin.getServerData().getVotePartyDisplay()
-						.required(plugin.getSpecialRewardsConfig().getVotePartyVotesRequired()));
+				return Integer.toString(plugin.getVoteParty().getVotesRequired());
 			}
 		}.withDescription("Amount of votes needed for voteparty"));
 
@@ -1544,13 +1407,6 @@ public class PlaceHolders {
 	@SuppressWarnings("unchecked")
 	private void updateCachedPlaceholder(PlaceHolder<VotingPluginUser> placeholder, VotingPluginUser user,
 			UUID uuid, String... keys) {
-		var pointGeneration = pointFence.generation(uuid);
-		try {
-		if ("Points".equalsIgnoreCase(placeholder.getUpdateDataKey())
-				&& !pointFence.readable(uuid, pointGeneration)) {
-			if (pointFence.recoverable(uuid)) schedulePointRecovery(user);
-			return;
-		}
 		for (String ident : Set.copyOf(placeholder.getCache().keySet())) {
 			ConcurrentHashMap<UUID, String> values = placeholder.getCache().get(ident);
 			if (values == null) continue;
@@ -1571,11 +1427,7 @@ public class PlaceHolders {
 				}
 			} else {
 				String value = placeholder.placeholderRequest(user, ident);
-				if ("Points".equalsIgnoreCase(placeholder.getUpdateDataKey())) {
-					pointFence.publish(uuid, pointGeneration, () -> {
-						if (plugin.isEnabled()) values.put(uuid, value);
-					});
-				} else values.put(uuid, value);
+				values.put(uuid, value);
 				if (getCacheLevel().onlineOnly() && !plugin.getPlaceholderPlayerPresence().isOnline(uuid)) {
 					values.remove(uuid);
 					continue;
@@ -1584,9 +1436,6 @@ public class PlaceHolders {
 						+ matchingKey(placeholder, keys) + " with " + value);
 			}
 		}
-		} finally {
-			pointFence.release(uuid);
-		}
 	}
 
 	private void publishCachedValue(PlaceHolder<VotingPluginUser> placeholder, VotingPluginUser user, UUID uuid,
@@ -1611,52 +1460,6 @@ public class PlaceHolders {
 		return placeholder.getUpdateDataKey();
 	}
 	
-	/** Blocks stale point results before a shared debit enters its worker. */
-	public void beginSharedPointDebit(UUID uuid) {
-		pointFence.begin(uuid, () -> clearPointResults(uuid));
-	}
-
-	/** Owns a queued batch without replacing its worker's mutation outcome. */
-	public java.util.function.Consumer<Boolean> sharedPointAdmissionCompletion(UUID uuid) {
-		beginSharedPointDebit(uuid);
-		var completed = new java.util.concurrent.atomic.AtomicBoolean();
-		return settled -> {
-			if (completed.compareAndSet(false, true)) pointFence.finishAdmission(uuid,
-					settled && plugin.isEnabled() && plugin.getPlaceholders() == this);
-		};
-	}
-
-	private void clearPointResults(UUID uuid) {
-		for (PlaceHolder<VotingPluginUser> placeholder : userDataChangeClassification.all()) {
-			if ("Points".equalsIgnoreCase(placeholder.getUpdateDataKey()) && placeholder.isUsesCache()) {
-				placeholder.clearCachePlayer(uuid);
-			}
-		}
-	}
-
-	/** Completes the fence only after the storage worker has reconciled its snapshot. */
-	public void finishSharedPointDebit(UUID uuid, boolean trustworthySnapshot) {
-		finishSharedPointDebit(uuid, trustworthySnapshot, trustworthySnapshot);
-	}
-
-	public void finishSharedPointDebit(UUID uuid, boolean knownOutcome, boolean trustworthySnapshot) {
-		pointFence.finish(uuid, knownOutcome, trustworthySnapshot);
-	}
-
-	/** Captures a worker refill generation without granting permission to retry a mutation. */
-	public java.util.function.Consumer<Boolean> sharedPointRefillCompletion(UUID uuid) {
-		var stamp = pointFence.beginRefill(uuid, () -> clearPointResults(uuid));
-		var completed = new java.util.concurrent.atomic.AtomicBoolean();
-		return verified -> {
-			if (!completed.compareAndSet(false, true)) return;
-			try {
-				pointFence.finishRefill(uuid, stamp, verified && plugin.isEnabled() && plugin.getPlaceholders() == this);
-			} finally {
-				pointFence.release(uuid);
-			}
-		};
-	}
-
 	/**
 	 * Handle player logout.
 	 * @param user the voting plugin user
@@ -1702,12 +1505,11 @@ public class PlaceHolders {
 	/**
 	 * Update placeholders for specific user.
 	 * @param user the voting plugin user
-	 * @param login whether to include uncached entries, such as a login or worker warmup
+	 * @param login whether this is a login update
 	 */
 	public void onUpdate(VotingPluginUser user, boolean login) {
 		if (user == null) return;
 		UUID uuid = user.getJavaUUID();
-		if (pointFence.recoverable(uuid)) schedulePointRecovery(user);
 		Player owner = plugin.getPlaceholderPlayerPresence().schedulerOwner(uuid);
 		PlaceholderClassification classification = userDataChangeClassification;
 		List<PlaceHolder<VotingPluginUser>> platformUpdates = new ArrayList<>();
@@ -1749,8 +1551,6 @@ public class PlaceHolders {
 	 * Reload placeholders.
 	 */
 	public void reload() {
-		pointFence.invalidateLifecycle();
-		pointRecoveryWorkers.clear();
 		platformUpdateGenerations.clear();
 		plugin.refreshPlaceholderPlayerPresence();
 		cacheLevel = plugin.getConfigFile().getPlaceholderCacheLevel();
@@ -1784,47 +1584,14 @@ public class PlaceHolders {
 	 * Schedule placeholder check for user.
 	 * @param user the voting plugin user
 	 */
-	public void schedulePlaceholderCheck(VotingPluginUser user) {
-		if (!plugin.isEnabled() || plugin.getPlaceholders() != this) return;
-		UUID uuid = user.getJavaUUID();
-		Object token = new Object();
-		long lifecycle = pointFence.lifecycle();
-		// Common warming and direct point recovery share queued and executing admission.
-		if (pointRecoveryWorkers.putIfAbsent(uuid, token) != null) return;
-		try {
-			plugin.getTimer().execute(() -> {
-				boolean warmed = false;
-				try {
-					if (!plugin.isEnabled() || plugin.getPlaceholders() != this || lifecycle != pointFence.lifecycle()) return;
-					var observed = pointFence.generation(uuid);
-					try {
-						// Invalid data in a complete published row is not a missing snapshot.
-						// Pending/unknown writes cannot authorize a competing point refill.
-						if (pointFence.recoverable(uuid)
-								|| (pointFence.readable(uuid, observed)
-										&& com.bencodez.advancedcore.api.user.UserStorage.MYSQL.equals(plugin.getStorageType())
-										&& publishedPointSnapshot(user) == null)) {
-							com.bencodez.votingplugin.user.SharedMysqlCacheReconciler.invalidateAndRefreshOnWorker(
-									plugin, user.getUUID(), user.getPointsPath());
-						}
-					} finally { pointFence.release(uuid); }
-					if (!plugin.isEnabled() || plugin.getPlaceholders() != this || lifecycle != pointFence.lifecycle()) return;
-					checkNonCachedPlaceholders();
-					// Preserve each cache level's existing offline-entry admission policy.
-					onUpdate(user, !getCacheLevel().onlineOnly() || plugin.getPlaceholderPlayerPresence().isOnline(uuid));
-					warmed = true;
-				} finally {
-					boolean retired = pointRecoveryWorkers.remove(uuid, token);
-					// A new identifier may have arrived after this worker's discovery pass.
-					if (retired && warmed && !placeholdersToSetCacheOn.isEmpty() && plugin.isEnabled()
-							&& plugin.getPlaceholders() == this && lifecycle == pointFence.lifecycle()) {
-						schedulePlaceholderCheck(user);
-					}
-				}
-			});
-		} catch (RuntimeException rejected) {
-			pointRecoveryWorkers.remove(uuid, token);
-			plugin.debug(rejected);
-		}
-	}
+	public void schedulePlaceholderCheck(VotingPluginUser user) {
+		plugin.getTimer().execute(new Runnable() {
+
+			@Override
+			public void run() {
+				checkNonCachedPlaceholders();
+				onUpdate(user, plugin.getPlaceholderPlayerPresence().isOnline(user.getJavaUUID()));
+			}
+		});
+	}
 }

VotingPlugin/src/main/java/com/bencodez/votingplugin/placeholders/PlaceholderPlayerPresence.java

@@ -7,8 +7,6 @@ import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
 import java.util.function.Supplier;
 
 import org.bukkit.entity.Player;
@@ -21,97 +19,6 @@ import org.bukkit.entity.Player;
 public final class PlaceholderPlayerPresence {
 	private final AtomicReference<Map<UUID, Player>> onlinePlayers = new AtomicReference<>(Map.of());
 	private final Object lifecycleLock = new Object();
-	private final Map<Player, LiveIdentity> identities = new IdentityHashMap<>();
-	private final Map<Player, Object> refreshReservations = new IdentityHashMap<>();
-
-	/** Immutable identity; lookup callers never need to access its Bukkit owner. */
-	public record LiveIdentity(UUID serverUuid, String playerName, UUID storageUuid) { }
-
-	/** Capture only on this player's owning thread (join or entity scheduler). */
-	public void captureOnline(UUID storageUuid, Player player) {
-		if (storageUuid == null || player == null) return;
-		LiveIdentity identity = new LiveIdentity(player.getUniqueId(), player.getName(), storageUuid);
-		synchronized (lifecycleLock) {
-			playerOnline(storageUuid, player);
-			identities.put(player, identity);
-		}
-	}
-
-	/** Rekey only the current owner. Delayed login cannot resurrect a retired session. */
-	public boolean updateStorageUuid(UUID uuid, Player player) {
-		if (uuid == null || player == null) return false;
-		synchronized (lifecycleLock) {
-			if (storageUuid(player) == null) return false;
-			Player currentOwner = onlinePlayers.get().get(uuid);
-			if (currentOwner != null && currentOwner != player) return false;
-			LiveIdentity identity = identities.get(player);
-			playerOnline(uuid, player);
-			if (identity != null) identities.put(player,
-					new LiveIdentity(identity.serverUuid(), identity.playerName(), uuid));
-			return true;
-		}
-	}
-
-	/** Snapshot-only lookup, with exact storage identities taking precedence over aliases. */
-	public LiveIdentity liveIdentity(UUID uuid) {
-		if (uuid == null) return null;
-		synchronized (lifecycleLock) {
-			Player exact = onlinePlayers.get().get(uuid);
-			if (exact != null) return identities.get(exact);
-			LiveIdentity found = null;
-			for (LiveIdentity identity : identities.values()) {
-				if (!uuid.equals(identity.serverUuid())) continue;
-				if (found != null) return null; // Uncertain or ambiguous: preserve the supplied UUID.
-				found = identity;
-			}
-			return found;
-		}
-	}
-
-	/**
-	 * Refresh membership without reading another region's players. Each scheduled
-	 * capture is fenced by its reservation; quit, join, another refresh and clear
-	 * invalidate it before it can publish stale identity data. The capture consumer
-	 * must run on that player's owning thread.
-	 */
-	public void refresh(Supplier<? extends Collection<? extends Player>> playersSupplier,
-			BiConsumer<Player, Consumer<UUID>> scheduleCapture) {
-		Map<Player, Object> reservations = new IdentityHashMap<>();
-		synchronized (lifecycleLock) {
-			Collection<? extends Player> players = playersSupplier.get();
-			Map<Player, Boolean> members = new IdentityHashMap<>();
-			if (players != null) for (Player player : players) {
-				if (player != null) members.put(player, Boolean.TRUE);
-			}
-			Map<UUID, Player> retained = new HashMap<>(onlinePlayers.get());
-			retained.entrySet().removeIf(entry -> !members.containsKey(entry.getValue()));
-			onlinePlayers.set(Map.copyOf(retained));
-			retainCurrentIdentities();
-			refreshReservations.clear();
-			members.keySet().forEach(player -> {
-				Object reservation = new Object();
-				refreshReservations.put(player, reservation);
-				reservations.put(player, reservation);
-			});
-		}
-		reservations.forEach((player, reservation) -> scheduleCapture.accept(player, storageUuid -> {
-			synchronized (lifecycleLock) {
-				if (refreshReservations.get(player) != reservation) return;
-				refreshReservations.remove(player);
-				if (storageUuid == null || !player.isOnline()) return;
-				Player currentOwner = onlinePlayers.get().get(storageUuid);
-				if (currentOwner != null && currentOwner != player) return;
-				UUID serverUuid = player.getUniqueId();
-				if (identities.entrySet().stream().anyMatch(entry -> entry.getKey() != player
-						&& serverUuid.equals(entry.getValue().serverUuid()))) return;
-				captureOnline(storageUuid, player);
-			}
-		}));
-	}
-
-	private void retainCurrentIdentities() {
-		identities.entrySet().removeIf(entry -> onlinePlayers.get().get(entry.getValue().storageUuid()) != entry.getKey());
-	}
 
 	public boolean isOnline(UUID uuid) {
 		return uuid != null && onlinePlayers.get().containsKey(uuid);
@@ -139,31 +46,24 @@ public final class PlaceholderPlayerPresence {
 	public void playerOnline(UUID uuid, Player player) {
 		if (uuid == null || player == null) return;
 		synchronized (lifecycleLock) {
-			refreshReservations.remove(player);
-			Player displacedOwner = onlinePlayers.get().get(uuid);
-			if (displacedOwner != null && displacedOwner != player) refreshReservations.remove(displacedOwner);
 			update(current -> {
 				Map<UUID, Player> next = new HashMap<>(current);
 				next.entrySet().removeIf(entry -> entry.getValue() == player && !entry.getKey().equals(uuid));
 				next.put(uuid, player);
 				return Map.copyOf(next);
 			});
-			retainCurrentIdentities();
 		}
 	}
 
 	public void playerOffline(UUID uuid) {
 		if (uuid == null) return;
 		synchronized (lifecycleLock) {
-			Player owner = onlinePlayers.get().get(uuid);
-			if (owner != null) refreshReservations.remove(owner);
 			update(current -> {
 				if (!current.containsKey(uuid)) return current;
 				Map<UUID, Player> next = new HashMap<>(current);
 				next.remove(uuid);
 				return Map.copyOf(next);
 			});
-			retainCurrentIdentities();
 		}
 	}
 
@@ -171,13 +71,11 @@ public final class PlaceholderPlayerPresence {
 	public boolean playerOffline(UUID uuid, Player expectedOwner) {
 		if (uuid == null || expectedOwner == null) return false;
 		synchronized (lifecycleLock) {
-			refreshReservations.remove(expectedOwner);
 			Map<UUID, Player> current = onlinePlayers.get();
 			if (current.get(uuid) != expectedOwner) return false;
 			Map<UUID, Player> next = new HashMap<>(current);
 			next.remove(uuid);
 			onlinePlayers.set(Map.copyOf(next));
-			retainCurrentIdentities();
 			return true;
 		}
 	}
@@ -215,8 +113,6 @@ public final class PlaceholderPlayerPresence {
 				}
 			}
 			onlinePlayers.set(Map.copyOf(next));
-			refreshReservations.clear();
-			retainCurrentIdentities();
 		}
 	}
 
@@ -226,11 +122,11 @@ public final class PlaceholderPlayerPresence {
 		if (players != null) players.forEach((uuid, player) -> {
 			if (uuid != null && player != null) next.put(uuid, player);
 		});
-		synchronized (lifecycleLock) { onlinePlayers.set(Map.copyOf(next)); refreshReservations.clear(); retainCurrentIdentities(); }
+		synchronized (lifecycleLock) { onlinePlayers.set(Map.copyOf(next)); }
 	}
 
 	public void clear() {
-		synchronized (lifecycleLock) { onlinePlayers.set(Map.of()); identities.clear(); refreshReservations.clear(); }
+		synchronized (lifecycleLock) { onlinePlayers.set(Map.of()); }
 	}
 
 	/** Publish an offline-only result atomically with player lifecycle capture. */

VotingPlugin/src/main/java/com/bencodez/votingplugin/placeholders/PointPlaceholderFence.java

@@ -1,107 +0,0 @@
-package com.bencodez.votingplugin.placeholders;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-/** Coordinates point rendering with in-flight shared-storage mutations. */
-final class PointPlaceholderFence {
-	private static final class State {
-		long generation;
-		int pending;
-		int readers;
-		int refills;
-		boolean uncertain;
-		boolean snapshotUnavailable;
-	}
-
-	private final Map<UUID, State> states = new HashMap<>();
-	private long generation;
-	private long lifecycle;
-	record Stamp(long lifecycle, long generation) { }
-
-	synchronized Stamp generation(UUID uuid) {
-		State state = states.computeIfAbsent(uuid, ignored -> {
-			State created = new State();
-			created.generation = ++generation;
-			return created;
-		});
-		state.readers++;
-		return new Stamp(lifecycle, state.generation);
-	}
-
-	synchronized boolean readable(UUID uuid, Stamp observed) {
-		if (lifecycle != observed.lifecycle()) return false;
-		State state = states.get(uuid);
-		return state != null && state.generation == observed.generation()
-				&& state.pending == 0 && state.refills == 0 && !state.uncertain && !state.snapshotUnavailable;
-	}
-
-	synchronized void release(UUID uuid) {
-		State state = states.get(uuid);
-		if (state == null || state.readers == 0) throw new IllegalStateException("Unbalanced point reader");
-		state.readers--;
-		retireIfSafe(uuid, state);
-	}
-
-	private void retireIfSafe(UUID uuid, State state) {
-		if (state.readers == 0 && state.pending == 0 && state.refills == 0 && !state.uncertain && !state.snapshotUnavailable) states.remove(uuid);
-	}
-
-	synchronized void invalidateLifecycle() { lifecycle++; }
-	synchronized long lifecycle() { return lifecycle; }
-	synchronized boolean recoverable(UUID uuid) {
-		State state = states.get(uuid);
-		return state != null && state.snapshotUnavailable && !state.uncertain && state.pending == 0 && state.refills == 0;
-	}
-
-	synchronized Stamp beginRefill(UUID uuid, Runnable invalidate) {
-		State state = states.computeIfAbsent(uuid, ignored -> new State());
-		state.generation = ++generation;
-		state.snapshotUnavailable = true;
-		state.refills++;
-		state.readers++;
-		invalidate.run();
-		return new Stamp(lifecycle, state.generation);
-	}
-
-	synchronized void begin(UUID uuid, Runnable invalidate) {
-		State state = states.computeIfAbsent(uuid, ignored -> new State());
-		state.generation = ++generation;
-		state.pending++;
-		invalidate.run();
-	}
-
-	synchronized void finish(UUID uuid, boolean knownOutcome, boolean trustworthy) {
-		State state = states.get(uuid);
-		if (state == null || state.pending == 0) throw new IllegalStateException("Unbalanced point mutation");
-		state.uncertain |= !knownOutcome;
-		state.snapshotUnavailable = !trustworthy || state.refills != 0;
-		state.pending--;
-		state.generation = ++generation;
-		retireIfSafe(uuid, state);
-	}
-
-	synchronized void finishAdmission(UUID uuid, boolean workerSettled) {
-		State state = states.get(uuid);
-		if (state == null || state.pending == 0) throw new IllegalStateException("Unbalanced point admission");
-		state.pending--;
-		state.snapshotUnavailable |= !workerSettled;
-		state.generation = ++generation;
-		retireIfSafe(uuid, state);
-	}
-
-	synchronized void finishRefill(UUID uuid, Stamp observed, boolean verified) {
-		State state = states.get(uuid);
-		if (state == null || state.refills == 0) throw new IllegalStateException("Unbalanced point refill");
-		boolean current = lifecycle == observed.lifecycle() && state.generation == observed.generation();
-		state.refills--;
-		state.snapshotUnavailable = !(verified && current && state.pending == 0 && state.refills == 0 && !state.uncertain);
-		// Even an obsolete read completion can replace storage data: retire every older render.
-		state.generation = ++generation;
-	}
-
-	synchronized void publish(UUID uuid, Stamp observed, Runnable publication) {
-		if (readable(uuid, observed)) publication.run();
-	}
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/OfflineBungeeVote.java

@@ -40,19 +40,6 @@ public class OfflineBungeeVote {
 	@Getter
 	@Setter
 	private String text;
-
-	public long getCanonicalOccurrenceTime() {
-		Long original = VoteOccurrenceMetadata.read(text);
-		return original == null ? 0L : original;
-	}
-
-	public void setCanonicalOccurrenceTime(long occurredAt) {
-		text = VoteOccurrenceMetadata.store(text, occurredAt);
-	}
-
-	public void setText(String updated) {
-		text = VoteOccurrenceMetadata.preserve(text, updated);
-	}
 	@Getter
 	private long time;
 	@Getter

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/VoteOccurrenceMetadata.java

@@ -1,46 +0,0 @@
-package com.bencodez.votingplugin.proxy;
-
-/** Optional occurrence metadata in existing opaque cache payloads, separate from cooldown time. */
-public final class VoteOccurrenceMetadata {
-    private static final String MARKER = "//vp-occurrence-time:";
-
-    private VoteOccurrenceMetadata() { }
-
-    /** Null means an older payload without metadata; -1 means explicitly invalid metadata. */
-    public static Long read(String payload) {
-        if (payload == null) return null;
-        int marker = payload.lastIndexOf(MARKER);
-        if (marker < 0) return null;
-        if (marker != payload.indexOf(MARKER)) return -1L;
-        return parse(payload.substring(marker + MARKER.length(),
-                Math.min(payload.length(), marker + MARKER.length() + 21)));
-    }
-
-    public static long parse(String raw) {
-        if (raw == null || raw.isEmpty() || raw.length() > 20) return -1L;
-        try {
-            long time = Long.parseLong(raw);
-            return time > 0 ? time : -1L;
-        } catch (NumberFormatException invalid) {
-            return -1L;
-        }
-    }
-
-    /** Existing v1/v2 totals parsers ignore this tagged trailing token. */
-    public static String store(String payload, long occurredAt) {
-        String text = payload == null ? "" : payload;
-        int marker = text.indexOf(MARKER);
-        if (marker >= 0) text = text.substring(0, marker);
-        return text + MARKER + (occurredAt > 0 ? occurredAt : -1L);
-    }
-
-    /** An occurrence tag alone does not represent a processed totals snapshot. */
-    public static boolean hasPayload(String payload) {
-        return payload != null && !payload.isEmpty() && !payload.startsWith(MARKER);
-    }
-
-    public static String preserve(String oldPayload, String updatedPayload) {
-        Long original = read(oldPayload);
-        return original == null ? updatedPayload : store(updatedPayload, original);
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/VotingPluginProxy.java

@@ -181,7 +181,6 @@ public abstract class VotingPluginProxy {
 		private String service;
 		private String uuid;
 		private long time;
-		private long canonicalOccurrenceTime;
 		private boolean realVote;
 		private boolean playerOnline;
 		private boolean delayValidated;
@@ -201,7 +200,6 @@ public abstract class VotingPluginProxy {
 		private final boolean realVote;
 		private final boolean timeQueue;
 		private final long queueTime;
-		private final long canonicalOccurrenceTime;
 		private final VoteTotalsSnapshot totals;
 		private final String uuid;
 		private final UUID voteId;
@@ -214,8 +212,7 @@ public abstract class VotingPluginProxy {
 
 		private MultiProxyVoteRetry(String player, String service, boolean realVote, boolean timeQueue, long queueTime,
 				VoteTotalsSnapshot totals, String uuid, UUID voteId, String origin, boolean delayValidated,
-				boolean delayValidationKnown, long canonicalOccurrenceTime) {
-			this.canonicalOccurrenceTime = canonicalOccurrenceTime;
+				boolean delayValidationKnown) {
 			this.player = player;
 			this.service = service;
 			this.realVote = realVote;
@@ -2898,8 +2895,7 @@ public abstract class VotingPluginProxy {
 			@Override
 			public void triggerVote(String player, String service, boolean realVote, boolean timeQueue, long queueTime,
 					VoteTotalsSnapshot text, String uuid) {
-				// Origin-less forwarding cannot establish an original canonical occurrence.
-				vote(player, service, realVote, timeQueue, queueTime, text, uuid, null, null, false, false, -1L);
+				vote(player, service, realVote, timeQueue, queueTime, text, uuid);
 			}
 
 			@Override
@@ -2922,14 +2918,6 @@ public abstract class VotingPluginProxy {
 						delayValidated, delayValidationKnown);
 			}
 
-			@Override
-			public void triggerVote(String player, String service, boolean realVote, boolean timeQueue, long queueTime,
-					VoteTotalsSnapshot text, String uuid, UUID voteId, String origin, boolean delayValidated,
-					boolean delayValidationKnown, long canonicalOccurrenceTime) {
-				receiveMultiProxyVote(player, service, realVote, timeQueue, queueTime, text, uuid, voteId, origin,
-						delayValidated, delayValidationKnown, canonicalOccurrenceTime);
-			}
-
 			@Override
 			public void onMultiProxyVoteAcknowledged(UUID voteId, String recipient) {
 				handleMultiProxyVoteAcknowledgement(voteId, recipient);
@@ -2966,13 +2954,6 @@ public abstract class VotingPluginProxy {
 	protected synchronized void receiveMultiProxyVote(String player, String service, boolean realVote,
 			boolean timeQueue, long queueTime, VoteTotalsSnapshot totals, String uuid, UUID wireVoteId, String origin,
 			boolean delayValidated, boolean delayValidationKnown) {
-		receiveMultiProxyVote(player, service, realVote, timeQueue, queueTime, totals, uuid, wireVoteId, origin,
-				delayValidated, delayValidationKnown, queueTime);
-	}
-
-	protected synchronized void receiveMultiProxyVote(String player, String service, boolean realVote,
-			boolean timeQueue, long queueTime, VoteTotalsSnapshot totals, String uuid, UUID wireVoteId, String origin,
-			boolean delayValidated, boolean delayValidationKnown, long canonicalOccurrenceTime) {
 		UUID voteId = wireVoteId == null ? UUID.randomUUID() : wireVoteId;
 		if (completedMultiProxyVotes.containsKey(voteId)) {
 			acknowledgeCompletedMultiProxyVote(voteId, origin);
@@ -2991,7 +2972,7 @@ public abstract class VotingPluginProxy {
 				// this process heap and is loaded again after a restart. It also lets the
 				// normal queue processor drain the spill as retry slots become available.
 				if (retainForwardedVoteOverflow(player, service, realVote, totals, uuid, voteId, queueTime, origin,
-						delayValidated, delayValidationKnown, canonicalOccurrenceTime)) {
+						delayValidated, delayValidationKnown)) {
 					scheduleTimeVoteRetry();
 					return;
 				}
@@ -2999,7 +2980,7 @@ public abstract class VotingPluginProxy {
 				return;
 			}
 			retry = new MultiProxyVoteRetry(player, service, realVote, timeQueue, queueTime, totals, uuid, voteId, origin,
-					delayValidated, delayValidationKnown, canonicalOccurrenceTime);
+					delayValidated, delayValidationKnown);
 			multiProxyVoteRetries.put(voteId, retry);
 		}
 		if (!retry.scheduled) attemptMultiProxyVote(retry);
@@ -3008,7 +2989,7 @@ public abstract class VotingPluginProxy {
 	/** Durably spills an over-capacity forwarded vote into the normal replay queue. */
 	private boolean retainForwardedVoteOverflow(String player, String service, boolean realVote,
 			VoteTotalsSnapshot totals, String uuid, UUID voteId, long queueTime, String origin, boolean delayValidated,
-			boolean delayValidationKnown, long canonicalOccurrenceTime) {
+			boolean delayValidationKnown) {
 		if (voteId == null || player == null || service == null || uuid == null) return false;
 		for (VoteTimeQueue queued : getVoteCacheHandler().getTimeChangeQueue()) {
 			if (voteId.equals(queued.getVoteId())) return true;
@@ -3016,7 +2997,6 @@ public abstract class VotingPluginProxy {
 		long time = queueTime == 0L ? System.currentTimeMillis() : queueTime;
 		VoteTimeQueue queued = new VoteTimeQueue(voteId, player, service, time, false,
 				Collections.emptySet(), Collections.emptySet(), totals == null ? "" : totals.toString(), false, uuid);
-		queued.setCanonicalOccurrenceTime(canonicalOccurrenceTime);
 		queued.setRealVote(realVote);
 		queued.setMultiProxyOrigin(origin == null ? "" : origin);
 		if (delayValidationKnown) queued.setDelayValidated(delayValidated);
@@ -3094,7 +3074,6 @@ public abstract class VotingPluginProxy {
 	private boolean persistDeferredMultiProxyReceipt(MultiProxyVoteRetry retry) {
 		VoteTimeQueue queued = findUnprocessedQueuedVote(retry.voteId);
 		if (queued == null) return false;
-		queued.setCanonicalOccurrenceTime(retry.canonicalOccurrenceTime);
 		queued.setMultiProxyOrigin(retry.origin);
 		queued.setRealVote(retry.realVote);
 		if (retry.delayValidationKnown) queued.setDelayValidated(retry.delayValidated);
@@ -3641,7 +3620,6 @@ public abstract class VotingPluginProxy {
 			// completion fence: its origin is persisted by PERSIST_DEFERRED_RECEIPT.
 			if (!queued.isProcessed()) return false;
 			queued.setProcessed(true);
-			queued.setCanonicalOccurrenceTime(retry.canonicalOccurrenceTime);
 			queued.setRealVote(retry.realVote);
 			queued.setMultiProxyOrigin(retry.origin);
 			if (retry.delayValidationKnown) queued.setDelayValidated(retry.delayValidated);
@@ -3653,7 +3631,6 @@ public abstract class VotingPluginProxy {
 				retry.queueTime == 0L ? System.currentTimeMillis() : retry.queueTime, false,
 				Collections.emptySet(), Collections.emptySet(), retry.totals == null ? "" : retry.totals.toString(), true,
 				retry.uuid);
-		quarantine.setCanonicalOccurrenceTime(retry.canonicalOccurrenceTime);
 		quarantine.setRealVote(retry.realVote);
 		quarantine.setMultiProxyOrigin(retry.origin);
 		if (retry.delayValidationKnown) quarantine.setDelayValidated(retry.delayValidated);
@@ -4085,7 +4062,7 @@ public abstract class VotingPluginProxy {
 					vote.setRealVote(queuedRealVote);
 					vote.setDeliveryStateDirty(true);
 				}
-                VoteTotalsSnapshot queuedTotals = !VoteOccurrenceMetadata.hasPayload(forwardedTotals[1]) ? null
+				VoteTotalsSnapshot queuedTotals = forwardedTotals[1].isEmpty() ? null
 						: VoteTotalsSnapshot.parseStorage(forwardedTotals[1]);
 				QueuedVoteResult result = replayQueuedVote(vote, queuedTotals, queuedRealVote);
 				if (result == QueuedVoteResult.RETRY || result == QueuedVoteResult.RETRY_NONBLOCKING) {
@@ -6074,9 +6051,6 @@ public abstract class VotingPluginProxy {
 
 	private JsonEnvelope cachedVoteEnvelope(OfflineBungeeVote vote, boolean online, boolean broadcast,
 			int num, int numberOfVotes) {
-		// Older cache rows may have been timestamped by an intermediate receiver.
-		// Preserve their normal time, but do not invent date occurrence provenance.
-		String payload = VoteOccurrenceMetadata.store(vote.getText(), vote.getCanonicalOccurrenceTime());
 		if (vote.hasCachedVoteBatch()) {
 			num = vote.getCachedBatchNumber();
 			numberOfVotes = vote.getCachedBatchSize();
@@ -6085,18 +6059,18 @@ public abstract class VotingPluginProxy {
 		if (vote.isDelayValidationKnown()) {
 			envelope = online
 					? VotingPluginWire.voteOnline(vote.getPlayerName(), vote.getUuid(), vote.getService(), vote.getTime(),
-							resolveCachedWasOnline(vote), vote.isRealVote(), payload, vote.getVoteId(),
+							resolveCachedWasOnline(vote), vote.isRealVote(), vote.getText(), vote.getVoteId(),
 							getConfig().getBungeeManageTotals(), broadcast, num, numberOfVotes, vote.isDelayValidated())
 					: VotingPluginWire.vote(vote.getPlayerName(), vote.getUuid(), vote.getService(), vote.getTime(),
-							resolveCachedWasOnline(vote), vote.isRealVote(), payload, vote.getVoteId(),
+							resolveCachedWasOnline(vote), vote.isRealVote(), vote.getText(), vote.getVoteId(),
 							getConfig().getBungeeManageTotals(), broadcast, num, numberOfVotes, vote.isDelayValidated());
 		} else {
 			envelope = online
 					? VotingPluginWire.voteOnline(vote.getPlayerName(), vote.getUuid(), vote.getService(), vote.getTime(),
-							resolveCachedWasOnline(vote), vote.isRealVote(), payload, vote.getVoteId(),
+							resolveCachedWasOnline(vote), vote.isRealVote(), vote.getText(), vote.getVoteId(),
 							getConfig().getBungeeManageTotals(), broadcast, num, numberOfVotes)
 					: VotingPluginWire.vote(vote.getPlayerName(), vote.getUuid(), vote.getService(), vote.getTime(),
-							resolveCachedWasOnline(vote), vote.isRealVote(), payload, vote.getVoteId(),
+							resolveCachedWasOnline(vote), vote.isRealVote(), vote.getText(), vote.getVoteId(),
 							getConfig().getBungeeManageTotals(), broadcast, num, numberOfVotes);
 		}
 		// A cache entry is only known to have passed the proxy's delay gate when
@@ -6247,16 +6221,6 @@ public abstract class VotingPluginProxy {
 		}
 	}
 
-	/** Preserves captured receipt time independently of ordinary processing/cooldown time. */
-	public synchronized void vote(String player, String service, boolean realVote, boolean timeQueue, long queueTime,
-			VoteTotalsSnapshot text, String uuid, UUID voteId, long occurredAt) {
-		VoteTimeQueue retained = findQueuedVote(voteId);
-		if (vote(player, service, realVote, timeQueue, queueTime, text, uuid, retained, voteId,
-				false, false, occurredAt) == QueuedVoteResult.RETRY) {
-			throw new VoteRetryException();
-		}
-	}
-
 	/** Releases retry-only state after the bounded event-listener retries are exhausted. */
 	public synchronized void abandonLiveVoteRetry(UUID voteId) {
 		if (voteId != null) liveVoteRetries.remove(voteId);
@@ -6281,7 +6245,6 @@ public abstract class VotingPluginProxy {
 	public synchronized VoteTimeQueue snapshotIncomingVoteForRestart(PendingIncomingVote pending) {
 		VoteTimeQueue queued = new VoteTimeQueue(pending.getVoteId(), pending.getPlayer(), pending.getService(),
 				pending.getAcceptedAt());
-		queued.setCanonicalOccurrenceTime(pending.getAcceptedAt());
 		LiveVoteRetryState retry = liveVoteRetries.get(pending.getVoteId());
 		if (retry != null) {
 			queued.setUuid(retry.uuid == null ? "" : retry.uuid);
@@ -6312,7 +6275,6 @@ public abstract class VotingPluginProxy {
 			queued.setMultiProxyForwardingHandled(retry.multiProxyForwardingHandled);
 			if (retry.delayValidationKnown) queued.setDelayValidated(retry.delayValidated);
 			if (retry.totals != null) queued.setTotals(retry.totals.toString());
-			if (retry.canonicalOccurrenceTime != 0L) queued.setCanonicalOccurrenceTime(retry.canonicalOccurrenceTime);
 		}
 		return queued;
 	}
@@ -6337,7 +6299,7 @@ public abstract class VotingPluginProxy {
 		if (retry == null && !recovery.isVotePartyApplied() && !recovery.isTotalsApplied()
 				&& recovery.isRealVote() && !recovery.isWasOnlineKnown()
 				&& (recovery.getUuid() == null || recovery.getUuid().isEmpty())
-				&& !VoteOccurrenceMetadata.hasPayload(recovery.getTotals())) return true;
+				&& (recovery.getTotals() == null || recovery.getTotals().isEmpty())) return true;
 		VoteTimeQueue state = retry == null ? recovery
 				: snapshotIncomingVoteForRestart(new PendingIncomingVote(recovery.getVoteId(), recovery.getName(),
 						recovery.getService(), recovery.getTime()));
@@ -6385,13 +6347,6 @@ public abstract class VotingPluginProxy {
 	private synchronized QueuedVoteResult vote(String player, String service, boolean realVote, boolean timeQueue,
 			long queueTime, VoteTotalsSnapshot text, String uuid, VoteTimeQueue queuedVote, UUID requestedVoteId,
 			boolean upstreamDelayValidated, boolean upstreamDelayValidationKnown) {
-		return vote(player, service, realVote, timeQueue, queueTime, text, uuid, queuedVote, requestedVoteId,
-				upstreamDelayValidated, upstreamDelayValidationKnown, 0L);
-	}
-
-	private synchronized QueuedVoteResult vote(String player, String service, boolean realVote, boolean timeQueue,
-			long queueTime, VoteTotalsSnapshot text, String uuid, VoteTimeQueue queuedVote, UUID requestedVoteId,
-			boolean upstreamDelayValidated, boolean upstreamDelayValidationKnown, long upstreamOccurrenceTime) {
 		try {
 			String requestPlayer = player;
 			if (!ServiceSiteValidator.isValid(service)) {
@@ -6515,13 +6470,6 @@ public abstract class VotingPluginProxy {
 					: (queueTime != 0 ? queueTime
 							: LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
 
-			MultiProxyVoteRetry forwardedOccurrence = multiProxyVoteRetries.get(voteId);
-			long canonicalOccurrenceTime = retryState != null ? retryState.canonicalOccurrenceTime
-					: upstreamOccurrenceTime != 0L ? upstreamOccurrenceTime
-					: forwardedOccurrence != null ? forwardedOccurrence.canonicalOccurrenceTime
-					: queuedVote == null ? time
-					: queuedVote.getCanonicalOccurrenceTime() == 0L ? -1L : queuedVote.getCanonicalOccurrenceTime();
-
 			Set<String> broadcastTargets = queuedVote == null ? new LinkedHashSet<>()
 					: new LinkedHashSet<>(queuedVote.getBroadcastTargets());
 			Set<String> broadcastForwardedServers = queuedVote == null ? new LinkedHashSet<>()
@@ -6591,7 +6539,6 @@ public abstract class VotingPluginProxy {
 				VoteTimeQueue delayedVote = new VoteTimeQueue(voteId, player, service, time,
 						proxyBroadcastHandled, broadcastTargets, broadcastForwardedServers,
 						projectedTotals == null ? "" : projectedTotals.toString(), false, uuid);
-				if (canonicalOccurrenceTime != 0L) delayedVote.setCanonicalOccurrenceTime(canonicalOccurrenceTime);
 				delayedVote.setRealVote(realVote);
 				delayedVote.setWasOnline(playerOnline);
 				if (authoritativeDelayValidationKnown) {
@@ -6632,14 +6579,12 @@ public abstract class VotingPluginProxy {
 				}
 				retryState.totalsInput = data;
 				if (queuedVote != null && queuedVote.isTotalsApplied()) {
-                    retryState.totals = text != null ? text : VoteOccurrenceMetadata.hasPayload(queuedVote.getTotals())
-                            ? VoteTotalsSnapshot.parseStorage(queuedVote.getTotals()) : null;
+					retryState.totals = text != null ? text : VoteTotalsSnapshot.parseStorage(queuedVote.getTotals());
 				}
 				retryState.player = requestPlayer;
 				retryState.service = service;
 				retryState.uuid = uuid;
 				retryState.time = time;
-				retryState.canonicalOccurrenceTime = canonicalOccurrenceTime;
 				retryState.realVote = realVote;
 				retryState.playerOnline = playerOnline;
 				retryState.delayValidated = authoritativeDelayValidated;
@@ -6748,9 +6693,6 @@ public abstract class VotingPluginProxy {
 				text = new VoteTotalsSnapshot(0, 0, 0, 0, 0, votePartyVotes, currentVotePartyVotesRequired, 0);
 			}
 
-			String votePayload = canonicalOccurrenceTime == 0L ? text.toString()
-					: VoteOccurrenceMetadata.store(text.toString(), canonicalOccurrenceTime);
-
 			VoteLogStatus voteStatus = VoteLogStatus.IMMEDIATE;
 			boolean standaloneProxyBroadcast = canValidateStandaloneBroadcast && (proxyBroadcastHandled
 					|| proxyBroadcastDecider.usesImmediateForwarding(playerOnline));
@@ -6785,7 +6727,7 @@ public abstract class VotingPluginProxy {
 				}
 				if (standaloneBroadcastState == null) {
 					standaloneBroadcastState = new OfflineBungeeVote(voteId, player, uuid, service, time, realVote,
-							text == null ? "" : votePayload, false, true, proxyBroadcastTargets,
+							text == null ? "" : text.toString(), false, true, proxyBroadcastTargets,
 							broadcastForwardedServers, !sendVotesToAllServers, Collections.emptyMap(), queuedVote == null
 								? Collections.emptyMap() : queuedVote.getHttpBroadcastDeliveryIds());
 					standaloneBroadcastState.setWasOnline(playerOnline);
@@ -6833,7 +6775,7 @@ public abstract class VotingPluginProxy {
 					if (method == BungeeMethod.PLUGINMESSAGING || retryState.pluginMessageRouting)
                         rewardJournalOwner = findCachedBroadcastOwner(uuid, voteId);
 					if (rewardJournalOwner == null) rewardJournalOwner = createCachedRewardVote(voteId, player, uuid, service, time, realVote,
-							votePayload, false, playerOnline);
+							text.toString(), false, playerOnline);
 					if (retryState.delayValidationKnown) rewardJournalOwner.setDelayValidated(authoritativeDelayValidated);
 					markPendingRewardJournalTargets(rewardJournalOwner, rewardServers, retryState.deliveredRewardServers);
 					retryState.rewardJournalOwner = rewardJournalOwner;
@@ -6851,7 +6793,7 @@ public abstract class VotingPluginProxy {
 					OfflineBungeeVote rewardState = retryState.rewardStates.get(server.toLowerCase(Locale.ROOT));
 					if (rewardState == null) {
 						rewardState = createCachedRewardVote(voteId, player, uuid, service, time,
-								realVote, votePayload, standaloneProxyBroadcast, playerOnline);
+								realVote, text.toString(), standaloneProxyBroadcast, playerOnline);
 						if (retryState.delayValidationKnown) rewardState.setDelayValidated(authoritativeDelayValidated);
 						retryState.rewardStates.put(server.toLowerCase(Locale.ROOT), rewardState);
 					}
@@ -6904,10 +6846,10 @@ public abstract class VotingPluginProxy {
 
 						OfflineBungeeVote pendingVote = retryState.rewardStates.get(s.toLowerCase(Locale.ROOT));
 						JsonEnvelope rewardEnvelope = retryState.delayValidationKnown
-								? VotingPluginWire.vote(player, uuid, service, time, playerOnline, realVote, votePayload,
+								? VotingPluginWire.vote(player, uuid, service, time, playerOnline, realVote, text.toString(),
 										voteId, getConfig().getBungeeManageTotals(), broadcastHere, 1, 1,
 										authoritativeDelayValidated)
-								: VotingPluginWire.vote(player, uuid, service, time, playerOnline, realVote, votePayload,
+								: VotingPluginWire.vote(player, uuid, service, time, playerOnline, realVote, text.toString(),
 										voteId, getConfig().getBungeeManageTotals(), broadcastHere, 1, 1);
 						boolean rewardAccepted = sendVoteEnvelopeAccepted(s, 2, rewardEnvelope, pendingVote);
 						if (!rewardAccepted) {
@@ -6952,10 +6894,10 @@ public abstract class VotingPluginProxy {
 					}
 					if (pendingVote == null) {
 						pendingVote = standaloneProxyBroadcast
-							? new OfflineBungeeVote(voteId, player, uuid, service, time, realVote, votePayload, false,
+							? new OfflineBungeeVote(voteId, player, uuid, service, time, realVote, text.toString(), false,
 									true, proxyBroadcastTargets, broadcastForwardedServers, false, Collections.emptyMap(),
 									standaloneBroadcastState.getHttpBroadcastDeliveryIds())
-							: createCachedRewardVote(voteId, player, uuid, service, time, realVote, votePayload, false, playerOnline);
+							: createCachedRewardVote(voteId, player, uuid, service, time, realVote, text.toString(), false, playerOnline);
 						retryState.rewardStates.put(server.toLowerCase(Locale.ROOT), pendingVote);
 					}
 					pendingVote.setWasOnline(playerOnline);
@@ -6964,10 +6906,10 @@ public abstract class VotingPluginProxy {
 					if (!rewardAccepted) {
 						JsonEnvelope rewardEnvelope = retryState.delayValidationKnown
 								? VotingPluginWire.voteOnline(player, uuid, service, time, playerOnline, realVote,
-										votePayload, voteId, getConfig().getBungeeManageTotals(), broadcastHere, 1, 1,
+										text.toString(), voteId, getConfig().getBungeeManageTotals(), broadcastHere, 1, 1,
 										authoritativeDelayValidated)
 								: VotingPluginWire.voteOnline(player, uuid, service, time, playerOnline, realVote,
-										votePayload, voteId, getConfig().getBungeeManageTotals(), broadcastHere, 1, 1);
+										text.toString(), voteId, getConfig().getBungeeManageTotals(), broadcastHere, 1, 1);
 						rewardAccepted = sendVoteEnvelopeAccepted(server, 1, rewardEnvelope, pendingVote);
 						if (rewardAccepted) {
 							retryState.deliveredRewardServers.add(server);
@@ -7028,7 +6970,7 @@ public abstract class VotingPluginProxy {
 							}
 							if (standaloneBroadcastState == null) {
 								standaloneBroadcastState = new OfflineBungeeVote(voteId, player, uuid, service, time,
-										realVote, votePayload, false, true, targets, broadcastForwardedServers,
+										realVote, text.toString(), false, true, targets, broadcastForwardedServers,
 										true, Collections.emptyMap(), Collections.emptyMap());
 								standaloneBroadcastState.setWasOnline(true);
 								retryState.standaloneBroadcastState = standaloneBroadcastState;
@@ -7054,7 +6996,7 @@ public abstract class VotingPluginProxy {
 								}
 
 								JsonEnvelope broadcast = VotingPluginWire.voteBroadcast(uuid, player, service, time,
-										text == null ? "" : votePayload, true);
+										text == null ? "" : text.toString(), true);
 								if (method == BungeeMethod.HTTP) {
 									boolean forwarded = sendStableHttpEnvelope(targetServer,
 											stableLiveHttpBroadcastDeliveryId(voteId, targetServer), broadcast);
@@ -7086,10 +7028,10 @@ public abstract class VotingPluginProxy {
 						}
 					}
 					OfflineBungeeVote cachedReward = standaloneProxyBroadcast
-							? new OfflineBungeeVote(voteId, player, uuid, service, time, realVote, votePayload, false,
+							? new OfflineBungeeVote(voteId, player, uuid, service, time, realVote, text.toString(), false,
 									true, proxyBroadcastTargets, broadcastForwardedServers, false, Collections.emptyMap(),
 									standaloneBroadcastState.getHttpBroadcastDeliveryIds())
-							: createCachedRewardVote(voteId, player, uuid, service, time, realVote, votePayload, false, playerOnline);
+							: createCachedRewardVote(voteId, player, uuid, service, time, realVote, text.toString(), false, playerOnline);
 					cachedReward.setWasOnline(playerOnline);
 					if (retryState.delayValidationKnown) cachedReward.setDelayValidated(authoritativeDelayValidated);
 					retryState.pendingOnlineRewardState = cachedReward;
@@ -7267,10 +7209,6 @@ public abstract class VotingPluginProxy {
 			String uuid, String service, long time, boolean realVote, VoteTotalsSnapshot totals,
 			boolean delayValidated, boolean delayValidationKnown) {
 		if (multiProxyHandler == null) return false;
-		String forwardingTotals = VoteOccurrenceMetadata.store(totals == null ? "" : totals.toString(),
-				retryState != null && retryState.canonicalOccurrenceTime != 0
-						? retryState.canonicalOccurrenceTime : queuedVote == null ? time
-								: queuedVote.getCanonicalOccurrenceTime());
 		// A corrupt or unpersistable peer-classification file cannot safely identify
 		// which targets are legacy.  Stop before creating an ACK outbox that a legacy
 		// peer could never complete; the handler emits the operator recovery message.
@@ -7320,12 +7258,12 @@ public abstract class VotingPluginProxy {
 			// Older peers do not understand acknowledgements. Preserve their historical
 			// fire-and-forget route instead of creating an outbox they can never ACK.
 			return multiProxyHandler.sendMultiProxyEnvelopeAccepted(VotingPluginWire.vote(player, uuid, service, time,
-					false, realVote, forwardingTotals, findLiveVoteId(retryState), false, false,
+					false, realVote, totals == null ? "" : totals.toString(), findLiveVoteId(retryState), false, false,
 					1, 1), legacyRecipients);
 		}
 		if (outbox == null) {
 			outbox = new VoteTimeQueue(null, player, service, time, false, Collections.emptySet(),
-					Collections.emptySet(), forwardingTotals, true, uuid);
+					Collections.emptySet(), totals == null ? "" : totals.toString(), true, uuid);
 			// The live retry key is the stable vote ID; copy it from the enclosing state
 			// by locating its identity rather than creating a new duplicate record.
 			outbox.setVoteId(findLiveVoteId(retryState));
@@ -7380,7 +7318,7 @@ public abstract class VotingPluginProxy {
 			outbox.setDeliveryStateDirty(true);
 			if (!persistTimeVoteDelivery(outbox)) return false;
 			if (!multiProxyHandler.sendMultiProxyEnvelopeAccepted(VotingPluginWire.vote(player, uuid, service, time,
-					false, realVote, forwardingTotals, outbox.getVoteId(), false, false, 1, 1),
+					false, realVote, totals == null ? "" : totals.toString(), outbox.getVoteId(), false, false, 1, 1),
 					legacyPending)) {
 				outbox.setMultiProxyLegacyPendingRecipients(legacyPending);
 				outbox.setDeliveryStateDirty(true);
@@ -7410,14 +7348,10 @@ public abstract class VotingPluginProxy {
 	private VoteTimeQueue admitMultiProxyDiscoveryOutbox(LiveVoteRetryState retryState, VoteTimeQueue queuedVote,
 			String player, String uuid, String service, long time, boolean realVote, VoteTotalsSnapshot totals,
 			boolean delayValidated, boolean delayValidationKnown) {
-		String forwardingTotals = VoteOccurrenceMetadata.store(totals == null ? "" : totals.toString(),
-				retryState != null && retryState.canonicalOccurrenceTime != 0
-						? retryState.canonicalOccurrenceTime : queuedVote == null ? time
-								: queuedVote.getCanonicalOccurrenceTime());
 		VoteTimeQueue outbox = queuedVote;
 		if (outbox == null) {
 			outbox = new VoteTimeQueue(null, player, service, time, false, Collections.emptySet(),
-					Collections.emptySet(), forwardingTotals, true, uuid);
+					Collections.emptySet(), totals == null ? "" : totals.toString(), true, uuid);
 			outbox.setVoteId(findLiveVoteId(retryState));
 			if (outbox.getVoteId() == null) return null;
 			retryState.queuedVote = outbox;

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/VotingPluginWire.java

@@ -34,7 +34,6 @@ public final class VotingPluginWire {
 	}
 
 	public static final int SCHEMA_VERSION = 1;
-	public static final String K_CANONICAL_OCCURRENCE_TIME = "canonicalOccurrenceTime";
 
 	// =========================
 	// Subchannels (canonical)
@@ -183,16 +182,13 @@ public final class VotingPluginWire {
 	private static JsonEnvelope.Builder voteBuilder(String subChannel, String player, String uuid, String service,
 			long time, boolean wasOnline, boolean realVote, String totals, UUID voteId, boolean manageTotals,
 			boolean bungeeBroadcast, int num, int numberOfVotes) {
-		JsonEnvelope.Builder builder = base(subChannel).put(K_PLAYER, safe(player)).put(K_UUID, safe(uuid)).put(K_SERVICE, safe(service))
+		return base(subChannel).put(K_PLAYER, safe(player)).put(K_UUID, safe(uuid)).put(K_SERVICE, safe(service))
 				.put(K_TIME, time).put(K_WAS_ONLINE, wasOnline).put(K_WAS_ONLINE_KNOWN, true)
 				.put(K_REAL_VOTE, realVote).put(K_TOTALS, safe(totals))
 				.put(K_VOTE_ID, voteId == null ? "" : voteId.toString()).put(K_SET_TOTALS, true)
 				.put(K_MANAGE_TOTALS, manageTotals).put(K_QUEUED_DELIVERY, false)
 				.put(K_BUNGEE_BROADCAST, bungeeBroadcast).put(K_NUM, num)
 				.put(K_NUMBER_OF_VOTES, numberOfVotes);
-		Long occurrence = VoteOccurrenceMetadata.read(totals);
-		builder.put(K_CANONICAL_OCCURRENCE_TIME, occurrence == null ? time : occurrence);
-		return builder;
 	}
 
 	/**
@@ -218,15 +214,12 @@ public final class VotingPluginWire {
 	private static JsonEnvelope.Builder multiProxyVoteBuilder(String subChannel, String player, String uuid,
 			String service, long time, boolean wasOnline, boolean realVote, String totals, UUID voteId,
 			boolean manageTotals, boolean bungeeBroadcast, int num, int numberOfVotes, String origin) {
-		JsonEnvelope.Builder builder = base(subChannel).put(K_PLAYER, safe(player)).put(K_UUID, safe(uuid)).put(K_SERVICE, safe(service))
+		return base(subChannel).put(K_PLAYER, safe(player)).put(K_UUID, safe(uuid)).put(K_SERVICE, safe(service))
 				.put(K_TIME, time).put(K_WAS_ONLINE, wasOnline).put(K_WAS_ONLINE_KNOWN, true).put(K_REAL_VOTE, realVote).put(K_TOTALS, safe(totals))
 				.put(K_VOTE_ID, voteId == null ? "" : voteId.toString()).put(K_SET_TOTALS, true)
 				.put(K_MANAGE_TOTALS, manageTotals).put(K_QUEUED_DELIVERY, false)
 				.put(K_BUNGEE_BROADCAST, bungeeBroadcast).put(K_NUM, num)
 				.put(K_NUMBER_OF_VOTES, numberOfVotes).put(K_MULTI_PROXY_ORIGIN, safe(origin));
-		Long occurrence = VoteOccurrenceMetadata.read(totals);
-		builder.put(K_CANONICAL_OCCURRENCE_TIME, occurrence == null ? time : occurrence);
-		return builder;
 	}
 
 	/** Reliable multi-proxy variant of {@link #voteOnline}. */
@@ -645,7 +638,6 @@ public final class VotingPluginWire {
 		public final String uuid;
 		public final String service;
 		public final long time;
-		public final long canonicalOccurrenceTime;
 
 		public final boolean wasOnline;
 		public final boolean wasOnlineKnown;
@@ -667,13 +659,12 @@ public final class VotingPluginWire {
 				boolean wasOnlineKnown, boolean realVote, String totals, UUID voteId, boolean setTotals,
 				boolean manageTotals, boolean delayValidated, boolean delayValidationKnown, boolean queuedDelivery,
 				boolean queuedDeliveryKnown,
-				boolean broadcast, int num, int numberOfVotes, long canonicalOccurrenceTime) {
+				boolean broadcast, int num, int numberOfVotes) {
 			this.subChannel = subChannel;
 			this.player = player;
 			this.uuid = uuid;
 			this.service = service;
 			this.time = time;
-			this.canonicalOccurrenceTime = canonicalOccurrenceTime;
 			this.wasOnline = wasOnline;
 			this.wasOnlineKnown = wasOnlineKnown;
 			this.realVote = realVote;
@@ -704,13 +695,6 @@ public final class VotingPluginWire {
 		final boolean wasOnlineKnown = readBool(f, K_WAS_ONLINE_KNOWN, false);
 		final boolean realVote = readBool(f, K_REAL_VOTE, false);
 		final String totals = safe(f.get(K_TOTALS));
-		Long cachedOccurrence = VoteOccurrenceMetadata.read(totals);
-		// Missing or malformed provenance excludes only date accounting. An older
-		// intermediate proxy may have replaced ordinary time with its receipt time.
-		long occurrence = f.containsKey(K_CANONICAL_OCCURRENCE_TIME)
-				? VoteOccurrenceMetadata.parse(f.get(K_CANONICAL_OCCURRENCE_TIME))
-				: cachedOccurrence == null ? -1L : cachedOccurrence;
-		if (cachedOccurrence != null && (cachedOccurrence <= 0 || cachedOccurrence != occurrence)) occurrence = -1L;
 		final UUID voteId = readUuid(f, K_VOTE_ID);
 
 		final boolean setTotals = readBool(f, K_SET_TOTALS, true);
@@ -727,7 +711,7 @@ public final class VotingPluginWire {
 
 		return new Vote(sub, player, uuid, service, time, wasOnline, wasOnlineKnown, realVote, totals, voteId,
 				setTotals, manageTotals, delayValidated, delayValidationKnown, queuedDelivery, queuedDeliveryKnown,
-				broadcast, num, numberOfVotes, occurrence);
+				broadcast, num, numberOfVotes);
 	}
 
 	public static final class VoteDelayRejected {

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/bungee/VotingPluginBungee.java

@@ -614,18 +614,6 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		}
 	}
 
-	/** Captured ingress survives scheduler/reload/identity-resolution delays. */
-	public IncomingVoteRuntimeResult processIncomingVote(String player, String service, UUID voteId, long occurredAt) {
-		if (reloading) return IncomingVoteRuntimeResult.RETRY_AFTER_RELOAD;
-		synchronized (reloadLock) {
-			if (reloading) return IncomingVoteRuntimeResult.RETRY_AFTER_RELOAD;
-			VotingPluginProxy runtime = votingPluginProxy;
-			if (!runtimeOperational || runtime == null) return IncomingVoteRuntimeResult.RUNTIME_UNAVAILABLE;
-			runtime.vote(player, service, true, true, 0, null, null, voteId, occurredAt);
-			return IncomingVoteRuntimeResult.PROCESSED;
-		}
-	}
-
 	/** Owns a Votifier event before any fallible scheduler handoff. */
 	public void acceptIncomingVote(String player, String service) {
 		PendingIncomingVote pending = pendingIncomingVotes.admit(player, service);
@@ -684,7 +672,7 @@ public class VotingPluginBungee extends Plugin implements Listener {
 		try {
 			IncomingVoteRuntimeResult result;
 			synchronized (reloadLock) {
-				result = processIncomingVote(pending.getPlayer(), pending.getService(), pending.getVoteId(), pending.getAcceptedAt());
+				result = processIncomingVote(pending.getPlayer(), pending.getService(), pending.getVoteId());
 				if (result == IncomingVoteRuntimeResult.PROCESSED) pendingIncomingVotes.complete(pending);
 			}
 			if (result == IncomingVoteRuntimeResult.PROCESSED) {

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/cache/ProxyOnlineVoteCacheTable.java

@@ -132,8 +132,6 @@ public abstract class ProxyOnlineVoteCacheTable extends AbstractSqlTable {
 			return;
 		}
 
-		newText = com.bencodez.votingplugin.proxy.VoteOccurrenceMetadata.preserve(vote.getText(), newText);
-
 		String sql = "UPDATE " + qi(getTableName()) + " SET " + qi("text") + " = ?" + " WHERE " + qi("uuid")
 				+ " = ? AND " + qi("service") + " = ? AND " + qi("time") + " = ?;";
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/cache/ProxyVoteCacheTable.java

@@ -97,8 +97,6 @@ public abstract class ProxyVoteCacheTable extends AbstractSqlTable {
 			return;
 		}
 
-		newText = com.bencodez.votingplugin.proxy.VoteOccurrenceMetadata.preserve(vote.getText(), newText);
-
 		String sql = "UPDATE " + qi(getTableName()) + " SET " + qi("text") + " = ?" + " WHERE " + qi("uuid")
 				+ " = ? AND " + qi("service") + " = ? AND " + qi("time") + " = ? AND " + qi("server") + " = ?;";
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/multiproxy/MultiProxyHandler.java

@@ -444,14 +444,6 @@ public abstract class MultiProxyHandler {
 		triggerVote(player, service, realVote, timeQueue, queueTime, text, uuid, voteId, origin);
 	}
 
-	/** Additive occurrence metadata; queueTime remains the normal receiver clock convention. */
-	public void triggerVote(String player, String service, boolean realVote, boolean timeQueue, long queueTime,
-			VoteTotalsSnapshot text, String uuid, UUID voteId, String origin, boolean delayValidated,
-			boolean delayValidationKnown, long canonicalOccurrenceTime) {
-		triggerVote(player, service, realVote, timeQueue, queueTime, text, uuid, voteId, origin,
-				delayValidated, delayValidationKnown);
-	}
-
 	/** Called when a receiver acknowledges this proxy's stable vote ID. */
 	public void onMultiProxyVoteAcknowledged(UUID voteId, String recipient) {
 		// Optional for legacy implementations.
@@ -1284,14 +1276,8 @@ public abstract class MultiProxyHandler {
 				if (origin.isBlank()) {
 					triggerVote(player, service, realVote, true, 0L, VoteTotalsSnapshot.parseStorage(totals), uuid);
 				} else {
-					// Older reliable origin envelopes still carry the sender's original
-					// time. Keep it separate from receiver-local cooldown processing.
-					long occurrenceTime = !f.containsKey(VotingPluginWire.K_CANONICAL_OCCURRENCE_TIME)
-							&& com.bencodez.votingplugin.proxy.VoteOccurrenceMetadata.read(totals) == null
-							? wireVote.time : wireVote.canonicalOccurrenceTime;
 					triggerVote(player, service, realVote, true, 0L, VoteTotalsSnapshot.parseStorage(totals), uuid,
-							wireVote.voteId, origin, wireVote.delayValidated, wireVote.delayValidationKnown,
-							occurrenceTime);
+							wireVote.voteId, origin, wireVote.delayValidated, wireVote.delayValidationKnown);
 				}
 			}
 			return;

VotingPlugin/src/main/java/com/bencodez/votingplugin/proxy/velocity/VotingPluginVelocity.java

@@ -509,18 +509,6 @@ public class VotingPluginVelocity {
 		}
 	}
 
-	/** Captured ingress survives scheduler/reload/identity-resolution delays. */
-	public IncomingVoteRuntimeResult processIncomingVote(String player, String service, UUID voteId, long occurredAt) {
-		if (reloading) return IncomingVoteRuntimeResult.RETRY_AFTER_RELOAD;
-		synchronized (reloadLock) {
-			if (reloading) return IncomingVoteRuntimeResult.RETRY_AFTER_RELOAD;
-			VotingPluginProxy runtime = votingPluginProxy;
-			if (!runtimeOperational || runtime == null) return IncomingVoteRuntimeResult.RUNTIME_UNAVAILABLE;
-			runtime.vote(player, service, true, false, 0, null, null, voteId, occurredAt);
-			return IncomingVoteRuntimeResult.PROCESSED;
-		}
-	}
-
 	/** Owns a Votifier event before any fallible executor handoff. */
 	public void acceptIncomingVote(String player, String service) {
 		PendingIncomingVote pending = pendingIncomingVotes.admit(player, service);
@@ -570,7 +558,7 @@ public class VotingPluginVelocity {
 		try {
 			IncomingVoteRuntimeResult result;
 			synchronized (reloadLock) {
-				result = processIncomingVote(pending.getPlayer(), pending.getService(), pending.getVoteId(), pending.getAcceptedAt());
+				result = processIncomingVote(pending.getPlayer(), pending.getService(), pending.getVoteId());
 				if (result == IncomingVoteRuntimeResult.PROCESSED) pendingIncomingVotes.complete(pending);
 			}
 			if (result == IncomingVoteRuntimeResult.PROCESSED) {

VotingPlugin/src/main/java/com/bencodez/votingplugin/servicesites/ServiceSiteHandler.java

@@ -123,7 +123,8 @@ public class ServiceSiteHandler {
 
 	public void saveToServerData() {
 		List<String> out = toListFormat(sitesRef.get());
-		plugin.getServerData().setStringList(SERVERDATA_PATH, out);
+		plugin.getServerData().getData().set(SERVERDATA_PATH, out);
+		plugin.getServerData().saveData();
 	}
 
 	public void refreshFromWebOnce(boolean logMore) {

VotingPlugin/src/main/java/com/bencodez/votingplugin/signs/SignHandler.java

@@ -12,6 +12,7 @@ import org.bukkit.block.Skull;
 import org.bukkit.block.data.Directional;
 import org.bukkit.inventory.meta.SkullMeta;
 
+import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.topvoter.TopVoter;
@@ -24,14 +25,14 @@ public class SignHandler {
 
 	@Getter
 	@Setter
-	private volatile String data;
+	private String data;
 
 	/** The lines. */
 	private ArrayList<String> lines;
 
 	@Getter
 	@Setter
-	private volatile Location location;
+	private Location location;
 
 	private String playerName;
 
@@ -47,7 +48,7 @@ public class SignHandler {
 
 	@Getter
 	@Setter
-	private volatile Location skullLocation;
+	private Location skullLocation;
 
 	@Getter
 	@Setter
@@ -55,88 +56,6 @@ public class SignHandler {
 
 	private int votes;
 
-	private record Render(ArrayList<String> lines, String name, UUID identity, int votes) { }
-	private record DisplayUpdate(long generation, Location location, String data) { }
-	private DisplayUpdate preparing;
-	private long skullSequence;
-	private static final int MAX_DISCOVERED_SKULLS = 28;
-	private final java.util.Set<Location> displayedSkulls = new java.util.LinkedHashSet<>();
-	private SkullFrame lastSkullFrame;
-	private record SkullFrame(long sequence, long generation, Location origin, Location selected, String data,
-			String name, UUID identity) { }
-
-	private synchronized SkullFrame skullFrame(String name, UUID identity) {
-		var frame = new SkullFrame(++skullSequence, plugin.getTopVoterDisplayGeneration(), location.clone(),
-				skullLocation == null ? null : skullLocation.clone(), data, name, identity);
-		if (lastSkullFrame == null || lastSkullFrame.generation() != frame.generation()
-				|| !java.util.Objects.equals(lastSkullFrame.origin(), frame.origin())
-				|| !java.util.Objects.equals(lastSkullFrame.selected(), frame.selected())
-				|| !java.util.Objects.equals(lastSkullFrame.data(), frame.data())) displayedSkulls.clear();
-		lastSkullFrame = frame;
-		return frame;
-	}
-
-	/** Remember successful automatic publications, never arbitrary neighboring skulls. */
-	private synchronized void rememberSkull(SkullFrame frame, Location target) {
-		if (lastSkullFrame == frame && frame.selected() == null && displayedSkulls.size() < MAX_DISCOVERED_SKULLS)
-			displayedSkulls.add(target.clone());
-	}
-
-	private synchronized void forgetSkull(SkullFrame frame, Location target) {
-		if (lastSkullFrame == frame) displayedSkulls.remove(target);
-	}
-
-	private synchronized boolean assignedSkull(SkullFrame frame, Location target) {
-		return lastSkullFrame == frame && (java.util.Objects.equals(frame.selected(), target)
-				|| displayedSkulls.contains(target));
-	}
-
-	private synchronized ArrayList<Location> assignedSkulls(SkullFrame frame) {
-		if (lastSkullFrame != frame) return new ArrayList<>();
-		return new ArrayList<>(frame.selected() == null ? displayedSkulls : java.util.List.of(frame.selected()));
-	}
-
-	private boolean current(SkullFrame frame) {
-		if (!plugin.isEnabled() || plugin.getTopVoterDisplayGeneration() != frame.generation()) return false;
-		synchronized (this) {
-			return skullSequence == frame.sequence() && java.util.Objects.equals(location, frame.origin())
-					&& java.util.Objects.equals(skullLocation, frame.selected())
-					&& java.util.Objects.equals(data, frame.data());
-		}
-	}
-
-	/** Only coordinates cross regions; every block access occurs inside its own location task. */
-	private void onOwner(SkullFrame frame, Location target, Runnable action) {
-		try {
-			plugin.getBukkitScheduler().runTask(plugin, () -> {
-				if (current(frame)) action.run();
-			}, target);
-		} catch (RuntimeException rejected) { plugin.debug("Unable to schedule skull display"); }
-	}
-
-	private void updateSkull(SkullFrame frame, Location target, Runnable absent) {
-		onOwner(frame, target, () -> {
-			Block block = target.getBlock();
-			if (!(block.getState() instanceof Skull)) {
-				forgetSkull(frame, target);
-				if (absent != null) absent.run();
-				return;
-			}
-			String name = frame.name(); UUID identity = frame.identity();
-			// Queued region work may outlive the evidence used by the sign render.
-			TopVoter period = displayPeriod();
-			if (period != null && position > 0 && plugin.getConfigFile().isHideTopVoterIfNotPlayedBefore()) {
-				var rows = new ArrayList<>(plugin.getTopVoterDisplay(period).keySet());
-				if (rows.size() >= position) {
-					name = rows.get(position - 1).getPlayerName(); identity = rows.get(position - 1).getUuid();
-				} else { name = "No Player"; identity = null; }
-			}
-			if (!current(frame)) return;
-			if (!checkSkull(block, target, name, identity, frame) && absent != null) absent.run();
-		});
-	}
-
-
 	/**
 	 * Constructs a new SignHandler.
 	 *
@@ -162,28 +81,19 @@ public class SignHandler {
 	}
 
 	@SuppressWarnings("deprecation")
-	private boolean checkSkull(Block block, Location target, String name, UUID identity, SkullFrame frame) {
-		if (block.getState() instanceof Skull skull) {
-			if (name.isEmpty() || name.equalsIgnoreCase("No Player")) {
-				if (plugin.getConfigFile().isHideTopVoterIfNotPlayedBefore()) {
-					if (!current(frame) || !assignedSkull(frame, target)) return true;
-					skull.setOwnerProfile(null);
-					if (current(frame) && skull.update(true, false)) forgetSkull(frame, target);
-				}
-				return true;
-			}
-			if (!name.equals("No Player")) {
+	private boolean checkSkull(Block block) {
+		if (block.getState() instanceof Skull) {
+			if (!playerName.equals("No Player")) {
+				Skull skull = (Skull) block.getState();
 				try {
-					SkullMeta meta = (SkullMeta) plugin.getSkullCacheHandler().getSkull(identity, name).getItemMeta();
-					var profile = java.util.Objects.requireNonNull(meta.getOwnerProfile(), "Skull profile unavailable");
-					if (!current(frame)) return true;
-					skull.setOwnerProfile(profile);
-					if (current(frame) && skull.update(true, false)) rememberSkull(frame, target);
+					SkullMeta meta = (SkullMeta) plugin.getSkullCacheHandler().getSkull(uuid, playerName).getItemMeta();
+					skull.setOwnerProfile(meta.getOwnerProfile());
+					skull.update(true, false);
 				} catch (Exception e) {
-					plugin.debug("Failed to set skull for " + name);
+					plugin.debug("Failed to set skull for " + playerName);
 					plugin.debug(e);
-					if (!current(frame)) return true;
-					if (skull.setOwner(name) && current(frame) && skull.update(true, false)) rememberSkull(frame, target);
+					skull.setOwner(playerName);
+					skull.update(true, false);
 				}
 
 			}
@@ -196,24 +106,18 @@ public class SignHandler {
 	 * Check skulls.
 	 */
 	public void checkSkulls() {
-		Render rendered = currentRender();
-		checkSkulls(rendered.name(), rendered.identity());
-	}
+		if (noNameAvailable()) {
+			return;
+		}
+		if (skullLocation != null) {
+			checkSkull(skullLocation.getBlock());
+			return;
+		}
 
-	private void checkSkulls(String name, UUID identity) {
-		if ((name.equalsIgnoreCase("No Player") || name.isEmpty())
-				&& !plugin.getConfigFile().isHideTopVoterIfNotPlayedBefore()) {
-			return;
-		}
-		SkullFrame frame = skullFrame(name, identity);
-		if (frame.selected() != null) {
-			updateSkull(frame, frame.selected(), null);
-			return;
-		}
-		Location loc = frame.origin();
+		Location loc = location;
 		Location loc1 = new Location(loc.getWorld(), loc.getBlockX() - 1, loc.getBlockY() - 1, loc.getBlockZ() - 1);
 		Location loc2 = new Location(loc.getWorld(), loc.getBlockX() + 1, loc.getBlockY() + 1, loc.getBlockZ() + 1);
-		updateSkulls(loc1, loc2, frame);
+		updateSkulls(loc1, loc2);
 	}
 
 	/**
@@ -286,12 +190,6 @@ public class SignHandler {
 	/**
 	 * Store sign.
 	 */
-    /** Capture platform state on the caller before shutdown transfers publication ownership. */
-    public com.bencodez.votingplugin.data.ServerData.SignSnapshot captureShutdownSnapshot() {
-        return com.bencodez.votingplugin.data.ServerData.captureSignSnapshot(
-                sign, location, skullLocation, data, position);
-    }
-
 	public void storeSign() {
 		plugin.getServerData().setSign(sign, location, skullLocation, data, position);
 	}
@@ -300,131 +198,95 @@ public class SignHandler {
 	 * Update lines.
 	 */
 	public void updateLines() {
-		Render rendered = renderLines();
-		synchronized (this) { applyRender(rendered); }
-	}
-
-	private TopVoter displayPeriod() {
-		if ("all".equalsIgnoreCase(data)) return TopVoter.AllTime;
-		if ("monthly".equalsIgnoreCase(data)) return TopVoter.Monthly;
-		if ("weekly".equalsIgnoreCase(data)) return TopVoter.Weekly;
-		if ("daily".equalsIgnoreCase(data)) return TopVoter.Daily;
-		return null;
-	}
-
-	private Render renderLines() {
-		var rendered = new ArrayList<String>();
+		lines = new ArrayList<>();
 		checkValidSign();
-		if (position == 0) {
-			synchronized (this) { return new Render(rendered, playerName, uuid, votes); }
-		}
-		rendered.add(plugin.getConfigFile().getFormatSignTopVoterSignLine1());
-		rendered.add(plugin.getConfigFile().getFormatSignTopVoterSignLine2());
-		rendered.add(plugin.getConfigFile().getFormatSignTopVoterSignLine3());
-		rendered.add(plugin.getConfigFile().getFormatSignTopVoterSignLine4());
-		TopVoter period = displayPeriod();
-		java.util.Map<TopVoterPlayer, Integer> board = period == null ? java.util.Map.of()
-				: plugin.getTopVoterDisplay(period);
-		var users = new ArrayList<>(board.keySet());
-		String name = "No Player";
-		UUID identity = null;
-		int amount = 0;
-		if (users.size() >= position) {
-			TopVoterPlayer row = users.get(position - 1);
-			name = row.getPlayerName(); identity = row.getUuid(); amount = board.get(row);
-		}
-		for (int index = 0; index < rendered.size(); index++) {
-			rendered.set(index, rendered.get(index).replace("%votes%", Integer.toString(amount))
-					.replace("%player%", name).replace("%SiteName%", data)
-					.replace("%position%", Integer.toString(position)));
-		}
-		return new Render(ArrayUtils.colorize(rendered), name, identity, amount);
-	}
+		if (position != 0) {
+			String line1 = plugin.getConfigFile().getFormatSignTopVoterSignLine1();
+			String line2 = plugin.getConfigFile().getFormatSignTopVoterSignLine2();
+			String line3 = plugin.getConfigFile().getFormatSignTopVoterSignLine3();
+			String line4 = plugin.getConfigFile().getFormatSignTopVoterSignLine4();
+			lines.add(line1);
+			lines.add(line2);
+			lines.add(line3);
+			lines.add(line4);
 
-	/** Called under this monitor; never call storage/provider APIs from this scope. */
-	private void applyRender(Render rendered) {
-		lines = rendered.lines(); playerName = rendered.name(); uuid = rendered.identity(); votes = rendered.votes();
-	}
-
-	private Render currentRender() {
-		synchronized (this) { return new Render(new ArrayList<>(lines), playerName, uuid, votes); }
-	}
-
-	/** Update the sign on its owning scheduler, waiting once for admitted presence evidence when enabled. */
-	public void updateSign(int delay) {
-		TopVoter period = displayPeriod();
-		if (position != 0 && period != null && plugin.getConfigFile() != null
-				&& plugin.getConfigFile().isHideTopVoterIfNotPlayedBefore()) {
-			prepareDisplay(period, delay);
-			return;
-		}
-		plugin.getBukkitScheduler().runTaskLater(plugin, () -> writeSign(currentRender(), getLocation()),
-				delay, getLocation());
-	}
-
-	private void prepareDisplay(TopVoter period, int delay) {
-		long generation = plugin.getTopVoterDisplayGeneration();
-		Location target = getLocation().clone();
-		DisplayUpdate update;
-		synchronized (this) {
-			if (preparing != null && preparing.generation() == generation
-					&& preparing.location().equals(target) && java.util.Objects.equals(preparing.data(), data)) return;
-			update = new DisplayUpdate(generation, target, data);
-			preparing = update;
-		}
-		try {
-			var ready = plugin.getTopVoterDisplayAsync(period);
-			if (ready == null) schedulePreparedDisplay(update, delay);
-			else ready.whenComplete((ignored, failure) -> schedulePreparedDisplay(update, delay));
-		} catch (RuntimeException unavailable) {
-			schedulePreparedDisplay(update, delay);
-		}
-	}
-
-	private boolean current(DisplayUpdate update) {
-		return plugin.isEnabled() && plugin.getTopVoterDisplayGeneration() == update.generation()
-				&& java.util.Objects.equals(update.location(), getLocation())
-				&& java.util.Objects.equals(update.data(), data);
-	}
-
-	private void schedulePreparedDisplay(DisplayUpdate update, int delay) {
-		synchronized (this) { if (preparing != update) return; }
-		try {
-			plugin.getBukkitScheduler().runTaskLater(plugin, () -> {
-				try {
-					synchronized (SignHandler.this) { if (preparing != update) return; }
-					if (!current(update)) return;
-					// Resolve current evidence outside the sign monitor. Completion may reenter from the SDK worker.
-					Render rendered = renderLines();
-					if (!current(update)) return;
-					synchronized (SignHandler.this) {
-						if (preparing != update) return;
-						applyRender(rendered);
-					}
-					writeSign(rendered, update.location());
-				} finally {
-					synchronized (SignHandler.this) { if (preparing == update) preparing = null; }
-				}
-			}, delay, update.location());
-		} catch (RuntimeException rejected) {
-			synchronized (this) { if (preparing == update) preparing = null; }
-		}
-	}
-
-	@SuppressWarnings("deprecation")
-	private void writeSign(Render rendered, Location target) {
-		try {
-			BlockState state = target.getBlock().getState();
-			if (state instanceof Sign signState) {
-				for (int index = 0; index < rendered.lines().size() && index < 4; index++)
-					signState.setLine(index, rendered.lines().get(index));
-				signState.update();
-				checkSkulls(rendered.name(), rendered.identity());
+			ArrayList<TopVoterPlayer> users = null;
+			if (data.equalsIgnoreCase("all")) {
+				users = new ArrayList<>(plugin.getTopVoter(TopVoter.AllTime).keySet());
+			} else if (data.equalsIgnoreCase("monthly")) {
+				users = new ArrayList<>(plugin.getTopVoter(TopVoter.Monthly).keySet());
+			} else if (data.equalsIgnoreCase("weekly")) {
+				users = new ArrayList<>(plugin.getTopVoter(TopVoter.Weekly).keySet());
+			} else if (data.equalsIgnoreCase("daily")) {
+				users = new ArrayList<>(plugin.getTopVoter(TopVoter.Daily).keySet());
 			}
-		} catch (Exception failure) {
-			plugin.debug("Failed to update sign display");
-			plugin.debug(failure);
+
+			if (users != null && users.size() >= position) {
+				TopVoterPlayer user = users.get(position - 1);
+				playerName = user.getPlayerName();
+				uuid = user.getUuid();
+
+				votes = 0;
+				if (data.equalsIgnoreCase("all")) {
+					votes = plugin.getTopVoter(TopVoter.AllTime).get(user);
+				} else if (data.equalsIgnoreCase("monthly")) {
+					votes = plugin.getTopVoter(TopVoter.Monthly).get(user);
+				} else if (data.equalsIgnoreCase("weekly")) {
+					votes = plugin.getTopVoter(TopVoter.Weekly).get(user);
+				} else if (data.equalsIgnoreCase("daily")) {
+					votes = plugin.getTopVoter(TopVoter.Daily).get(user);
+				}
+
+				for (int j = 0; j < lines.size(); j++) {
+					lines.set(j, lines.get(j).replace("%votes%", "" + votes).replace("%player%", playerName));
+				}
+			} else {
+				playerName = "No Player";
+				votes = 0;
+				for (int j = 0; j < lines.size(); j++) {
+					lines.set(j, lines.get(j).replace("%votes%", "" + votes).replace("%player%", playerName));
+				}
+			}
+
+			for (int j = 0; j < lines.size(); j++) {
+				lines.set(j, lines.get(j).replace("%SiteName%", data).replace("%position%", "" + position));
+			}
+
+			lines = ArrayUtils.colorize(lines);
+
 		}
+
+	}
+
+	/**
+	 * Update sign.
+	 *
+	 * @param delay the delay
+	 */
+	public void updateSign(int delay) {
+		plugin.getBukkitScheduler().runTaskLater(plugin, new Runnable() {
+
+			@SuppressWarnings("deprecation")
+			@Override
+			public void run() {
+				try {
+					BlockState state = getLocation().getBlock().getState();
+					if (state instanceof Sign) {
+						Sign s = (Sign) state;
+
+						for (int j = 0; j < lines.size() && j < 4; j++) {
+							s.setLine(j, lines.get(j));
+						}
+						s.update();
+						checkSkulls();
+					}
+
+				} catch (Exception ex) {
+					plugin.debug("Failed to update sign at " + getLocation().toString());
+					VotingPluginMain.plugin.debug(ex);
+				}
+			}
+		}, delay, getLocation());
 	}
 
 	/**
@@ -434,38 +296,19 @@ public class SignHandler {
 	 * @param loc2 the second location
 	 */
 	public void updateSkulls(Location loc1, Location loc2) {
-		Render rendered = currentRender();
-		updateSkulls(loc1, loc2, rendered.name(), rendered.identity());
-	}
+		BlockState state = getLocation().getBlock().getState();
+		if (state instanceof Sign && state.getBlockData() instanceof Directional) {
+			Directional s = (Directional) state.getBlockData();
+			Block b = location.getBlock().getRelative(s.getFacing());
+			Block above = b.getRelative(BlockFace.UP);
+			if (checkSkull(above)) {
+				return;
+			}
 
-	private void updateSkulls(Location loc1, Location loc2, String name, UUID identity) {
-		updateSkulls(loc1, loc2, skullFrame(name, identity));
-	}
-
-	private void updateSkulls(Location loc1, Location loc2, SkullFrame frame) {
-		if (frame.name().isEmpty() || frame.name().equalsIgnoreCase("No Player")) {
-			if (plugin.getConfigFile().isHideTopVoterIfNotPlayedBefore())
-				for (Location target : assignedSkulls(frame)) updateSkull(frame, target, null);
-			return;
 		}
-		Runnable nearby = () -> {
-			for (int x = Math.min(loc1.getBlockX(), loc2.getBlockX()); x <= Math.max(loc1.getBlockX(), loc2.getBlockX()); x++)
-				for (int y = Math.min(loc1.getBlockY(), loc2.getBlockY()); y <= Math.max(loc1.getBlockY(), loc2.getBlockY()); y++)
-					for (int z = Math.min(loc1.getBlockZ(), loc2.getBlockZ()); z <= Math.max(loc1.getBlockZ(), loc2.getBlockZ()); z++) {
-						if (!current(frame)) return;
-						updateSkull(frame, new Location(frame.origin().getWorld(), x, y, z), null);
-					}
-		};
-		onOwner(frame, frame.origin(), () -> {
-			BlockState state = frame.origin().getBlock().getState();
-			if (state instanceof Sign && state.getBlockData() instanceof Directional direction) {
-				BlockFace facing = direction.getFacing();
-				Location preferred = new Location(frame.origin().getWorld(),
-						frame.origin().getBlockX() + facing.getModX(),
-						frame.origin().getBlockY() + facing.getModY() + 1,
-						frame.origin().getBlockZ() + facing.getModZ());
-				updateSkull(frame, preferred, nearby);
-			} else nearby.run();
-		});
+
+		for (Block block : MiscUtils.getInstance().getRegionBlocks(location.getWorld(), loc1, loc2)) {
+			checkSkull(block);
+		}
 	}
 }

VotingPlugin/src/main/java/com/bencodez/votingplugin/signs/Signs.java

@@ -64,69 +64,6 @@ public class Signs {
 		}
 	}
 
-    private final Object shutdownLock = new Object();
-    private ShutdownSigns shutdownSigns;
-    private java.util.concurrent.CompletableFuture<Void> shutdownAttempt;
-
-    private record ShutdownSigns(com.bencodez.votingplugin.data.ServerData data,
-            java.util.List<com.bencodez.votingplugin.data.ServerData.SignSnapshot> snapshot,
-            com.bencodez.votingplugin.util.ServerDataPublicationFence.Lease lease) { }
-
-    /** No YAML lock or disk wait on the lifecycle caller; failures retain the original payload. */
-    public java.util.concurrent.CompletionStage<Void> storeSignsForShutdown() {
-        synchronized (shutdownLock) {
-            if (shutdownAttempt != null && !shutdownAttempt.isCompletedExceptionally())
-                return shutdownAttempt.minimalCompletionStage();
-            if (shutdownSigns == null) {
-                var snapshot = new java.util.ArrayList<com.bencodez.votingplugin.data.ServerData.SignSnapshot>();
-                for (var sign : java.util.List.copyOf(getSigns())) snapshot.add(sign.captureShutdownSnapshot());
-                if (snapshot.isEmpty()) {
-                    shutdownAttempt = java.util.concurrent.CompletableFuture.completedFuture(null);
-                    return shutdownAttempt.minimalCompletionStage();
-                }
-                var data = java.util.Objects.requireNonNull(plugin.getServerData());
-                var fence = java.util.Objects.requireNonNull(plugin.getServerDataPublicationFence());
-                shutdownSigns = new ShutdownSigns(data, java.util.List.copyOf(snapshot), fence.acquire());
-            }
-            var publication = shutdownSigns;
-            var attempt = new java.util.concurrent.CompletableFuture<Void>();
-            shutdownAttempt = attempt;
-            try {
-                startShutdownWorker(() -> {
-                    try {
-                        java.util.Objects.requireNonNull(publication.data().publishShutdownSigns(publication.snapshot()))
-                                .whenComplete((ignored, failure) -> finishShutdownSigns(publication, attempt, failure));
-                    } catch (Throwable failure) { finishShutdownSigns(publication, attempt, failure); }
-                });
-            } catch (RuntimeException | Error failure) {
-                finishShutdownSigns(publication, attempt, failure);
-                throw failure;
-            }
-            return attempt.minimalCompletionStage();
-        }
-    }
-
-    private void finishShutdownSigns(ShutdownSigns publication,
-            java.util.concurrent.CompletableFuture<Void> attempt, Throwable failure) {
-        if (failure == null) {
-            try { publication.lease().close(); attempt.complete(null); }
-            catch (Throwable releaseFailure) { attempt.completeExceptionally(releaseFailure); }
-        } else {
-            // Neither rejected admission nor failed I/O proves durability or writer drain.
-            // Keep the same detached payload and lease for an explicit repeated-unload attempt.
-            try { plugin.getLogger().warning("Sign shutdown persistence failed; its payload remains owned. Recovery is not confirmed."); }
-            catch (RuntimeException | Error ignored) { }
-            attempt.completeExceptionally(failure);
-        }
-    }
-
-    /** Admission seam for deterministic rejection/cancellation tests. */
-    protected void startShutdownWorker(Runnable task) {
-        var worker = new Thread(task, "VotingPlugin-sign-shutdown");
-        worker.setDaemon(true);
-        worker.start();
-    }
-
 	/**
 	 * Update signs.
 	 */

VotingPlugin/src/main/java/com/bencodez/votingplugin/specialrewards/datemilestones/DateVoteLedger.java

@@ -1,294 +0,0 @@
-package com.bencodez.votingplugin.specialrewards.datemilestones;
-
-import com.bencodez.votingplugin.core.datemilestones.DateVoteEvent;
-import com.bencodez.votingplugin.util.DurableFiles;
-import java.io.IOException;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
-import java.nio.file.Path;
-import java.nio.channels.FileChannel;
-import java.nio.channels.FileLock;
-import java.nio.channels.OverlappingFileLockException;
-import java.nio.file.StandardOpenOption;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Properties;
-import java.util.Set;
-import java.util.UUID;
-
-/** Single local accounting owner. All entry points must run on a persistence worker. */
-public final class DateVoteLedger {
-    public record Progress(int votes, Set<Integer> reservedAwards, Set<Integer> submittedAwards, Set<Integer> deferredAwards) { }
-    private static final int MAX_RECORDS = 100_000;
-    private final Path directory;
-    private final int recordCapacity;
-    public DateVoteLedger(Path directory) { this(directory, MAX_RECORDS); }
-    // Smaller limits keep boundary regression fixtures bounded; production uses MAX_RECORDS.
-    DateVoteLedger(Path directory, int recordCapacity) {
-        if (recordCapacity < 1 || recordCapacity > MAX_RECORDS) throw new IllegalArgumentException("Invalid milestone record capacity");
-        this.directory = directory.toAbsolutePath().normalize();
-        this.recordCapacity = recordCapacity;
-    }
-
-    public synchronized List<Integer> record(DateVoteEvent event, UUID player, UUID occurrence) throws IOException {
-        return record(event, player, occurrence, true);
-    }
-    public synchronized List<Integer> record(DateVoteEvent event, UUID player, UUID occurrence, boolean processRewards) throws IOException {
-        return withLedgerLock(() -> recordLocked(event, player, occurrence, processRewards));
-    }
-    private List<Integer> recordLocked(DateVoteEvent event, UUID player, UUID occurrence, boolean processRewards) throws IOException {
-        seal(event);
-        Path file = playerFile(event, player);
-        Properties state = read(file);
-        String fingerprint = state.getProperty("fingerprint");
-        if (fingerprint != null && !fingerprint.equals(event.fingerprint())) throw new IOException("Event accounting changed; use a new event ID");
-        validateFingerprint(event, state);
-        Set<UUID> seen = occurrences(state);
-        boolean changed = !seen.contains(occurrence);
-        if (changed && (seen.size() >= 4096 || votes(state) >= 4096))
-            throw new IOException("Event occurrence capacity reached (4096); progress retained");
-        seen.add(occurrence);
-        state.setProperty("fingerprint", event.fingerprint());
-        state.setProperty("seen", String.join(",", seen.stream().map(UUID::toString).sorted().toList()));
-        int votes = votes(state);
-        List<Integer> awards = new ArrayList<>();
-        for (int threshold : event.thresholds()) {
-            String key = "award." + threshold;
-            if (votes >= threshold && !state.containsKey(key)) {
-                state.setProperty(key, "DEFERRED");
-                changed = true;
-            }
-            if (processRewards && votes >= threshold && "DEFERRED".equals(state.getProperty(key))) awards.add(threshold);
-        }
-        // Persist counts and known unattempted awards; each submission claims only its own threshold.
-        if (changed) write(file, state);
-        return List.copyOf(awards);
-    }
-    /** Explicit administrative adjustment; retains receipt IDs and all prior reward fences. */
-    public synchronized Progress setVotes(DateVoteEvent event, UUID player, int value) throws IOException {
-        if (value < 0 || value > 4096) throw new IllegalArgumentException("Votes must be between 0 and 4096");
-        return withLedgerLock(() -> {
-            seal(event);
-            Path file = playerFile(event, player);
-            Properties state = read(file);
-            validateFingerprint(event, state);
-            state.setProperty("fingerprint", event.fingerprint());
-            state.putIfAbsent("seen", "");
-            state.setProperty("adjustment", Integer.toString(value - occurrences(state).size()));
-            for (int threshold : event.thresholds()) if (value >= threshold)
-                state.putIfAbsent("award." + threshold, "DEFERRED");
-            write(file, state);
-            return progressLocked(event, player);
-        });
-    }
-    /** Force skips the count requirement; even an explicit repeat cannot erase an uncertain reservation. */
-    public synchronized boolean reserveForced(DateVoteEvent event, UUID player, int threshold,
-            boolean ignoreLimits) throws IOException {
-        if (!event.thresholds().contains(threshold)) throw new IllegalArgumentException("Unknown milestone threshold");
-        return withLedgerLock(() -> {
-            seal(event);
-            Path file = playerFile(event, player);
-            Properties state = read(file);
-            validateFingerprint(event, state);
-            String previous = state.getProperty("award." + threshold);
-            if ("RESERVED".equals(previous) || !ignoreLimits && "SUBMITTED".equals(previous)) return false;
-            state.setProperty("fingerprint", event.fingerprint());
-            state.putIfAbsent("seen", "");
-            state.putIfAbsent("adjustment", "0");
-            state.setProperty("award." + threshold, "RESERVED");
-            write(file, state);
-            return true;
-        });
-    }
-    /** Atomically admit one known unattempted threshold immediately before its external submission. */
-    public synchronized boolean reserve(DateVoteEvent event, UUID player, int threshold) throws IOException {
-        return withLedgerLock(() -> reserveLocked(event, player, threshold));
-    }
-    private boolean reserveLocked(DateVoteEvent event, UUID player, int threshold) throws IOException {
-        Path file = playerFile(event, player);
-        Properties state = read(file);
-        validateFingerprint(event, state);
-        if (!event.thresholds().contains(threshold) || votes(state) < threshold
-                || !"DEFERRED".equals(state.getProperty("award." + threshold))) return false;
-        state.setProperty("award." + threshold, "RESERVED");
-        write(file, state);
-        return true;
-    }
-    public synchronized void submitted(DateVoteEvent event, UUID player, int threshold) throws IOException {
-        withLedgerLock(() -> { submittedLocked(event, player, threshold); return null; });
-    }
-    private void submittedLocked(DateVoteEvent event, UUID player, int threshold) throws IOException {
-        Path file = playerFile(event, player);
-        Properties state = read(file);
-        validateFingerprint(event, state);
-        if (!"RESERVED".equals(state.getProperty("award." + threshold))) return;
-        state.setProperty("award." + threshold, "SUBMITTED");
-        write(file, state);
-    }
-    public synchronized Progress progress(DateVoteEvent event, UUID player) throws IOException {
-        // An absent ledger is a valid empty snapshot. A read must not initialize
-        // accounting storage, including for legacy votes with no event progress.
-        // Unknown/unreadable paths still enter the checked ownership path.
-        if (Files.notExists(directory, LinkOption.NOFOLLOW_LINKS))
-            return new Progress(0, Set.of(), Set.of(), Set.of());
-        return withLedgerLock(() -> progressLocked(event, player));
-    }
-    private Progress progressLocked(DateVoteEvent event, UUID player) throws IOException {
-        Properties definitions = readSealedDefinitions(event);
-        String sealed = definitions.getProperty(event.id());
-        if (sealed != null && !sealed.equals(event.fingerprint())) throw new IOException("Event accounting changed; use a new ID");
-        Properties state = read(playerFile(event, player));
-        validateFingerprint(event, state);
-        Set<Integer> reserved = new HashSet<>(), submitted = new HashSet<>(), deferred = new HashSet<>();
-        for (String key : state.stringPropertyNames()) {
-            if (key.startsWith("award.")) {
-                int threshold;
-                try { threshold = Integer.parseInt(key.substring(6)); }
-                catch (NumberFormatException invalid) { throw new IOException("Invalid award state", invalid); }
-                if ("RESERVED".equals(state.getProperty(key))) reserved.add(threshold);
-                else if ("SUBMITTED".equals(state.getProperty(key))) submitted.add(threshold);
-                else if ("DEFERRED".equals(state.getProperty(key))) deferred.add(threshold);
-                else throw new IOException("Unknown award state");
-            }
-        }
-        return new Progress(votes(state), Set.copyOf(reserved), Set.copyOf(submitted), Set.copyOf(deferred));
-    }
-    @FunctionalInterface
-    private interface LedgerAction<T> { T run() throws IOException; }
-    private <T> T withLedgerLock(LedgerAction<T> action) throws IOException {
-        if (Files.isSymbolicLink(directory)) throw new IOException("Unsafe milestone directory");
-        Files.createDirectories(directory);
-        if (Files.isSymbolicLink(directory)) throw new IOException("Unsafe milestone directory");
-        // Interning shares this monitor across plugin classloaders without retaining a static registry.
-        // On Unix, closing any descriptor for a file can release another channel's process-owned lock.
-        String monitor = ("com.bencodez.votingplugin.DateVoteLedger:" + directory.toRealPath()).intern();
-        if (Thread.holdsLock(monitor)) throw new IOException("Date milestone ledger is busy");
-        synchronized (monitor) {
-            Path lockPath = directory.resolve(".ledger.lock");
-            if (Files.isSymbolicLink(lockPath) || (Files.exists(lockPath, LinkOption.NOFOLLOW_LINKS)
-                    && !Files.isRegularFile(lockPath, LinkOption.NOFOLLOW_LINKS)))
-                throw new IOException("Unsafe milestone lock path");
-            try (FileChannel channel = FileChannel.open(lockPath, StandardOpenOption.CREATE, StandardOpenOption.WRITE,
-                    LinkOption.NOFOLLOW_LINKS)) {
-                FileLock lock;
-                try { lock = channel.tryLock(); }
-                catch (OverlappingFileLockException busy) { throw new IOException("Date milestone ledger is busy", busy); }
-                if (lock == null) throw new IOException("Date milestone ledger is busy");
-                try (lock) { return action.run(); }
-            }
-        }
-    }
-    private void validateFingerprint(DateVoteEvent event, Properties state) throws IOException {
-        if (state.isEmpty()) return;
-        if (!event.fingerprint().equals(state.getProperty("fingerprint")))
-            throw new IOException("Event accounting changed or state invalid; use a new ID");
-        int votes = votes(state);
-        for (int threshold : event.thresholds()) if (votes >= threshold && !state.containsKey("award." + threshold))
-            throw new IOException("Missing reached milestone award state; progress retained for review");
-        for (String key : state.stringPropertyNames()) if (key.startsWith("award.")
-                && !event.thresholds().contains(Integer.parseInt(key.substring(6))))
-            throw new IOException("Award is outside configured milestone contract");
-    }
-    private void seal(DateVoteEvent event) throws IOException {
-        Properties definitions = readSealedDefinitions(event);
-        String old = definitions.getProperty(event.id());
-        if (old != null && !old.equals(event.fingerprint())) throw new IOException("DateVoteMilestones event " + event.id() + " changed accounting; use a new ID");
-        if (old == null) {
-            if (definitions.size() >= 1024) throw new IOException("Event definition capacity reached");
-            definitions.setProperty(event.id(), event.fingerprint());
-            write(directory.resolve("definitions.properties"), definitions);
-        }
-    }
-    /** Missing metadata cannot turn surviving player history into a fresh event. */
-    private Properties readSealedDefinitions(DateVoteEvent event) throws IOException {
-        if (Files.isSymbolicLink(directory)) throw new IOException("Unsafe milestone directory");
-        Properties definitions = read(directory.resolve("definitions.properties"));
-        if (!definitions.containsKey(event.id()) && Files.exists(directory, LinkOption.NOFOLLOW_LINKS)) {
-            // Bounded accounting directory; this lookup is exclusively on the I/O owner.
-            try (var history = Files.newDirectoryStream(directory, event.fileId() + "-*.properties")) {
-                if (history.iterator().hasNext())
-                    throw new IOException("Missing historical event seal; preserve state and repair metadata before accounting");
-            }
-        }
-        return definitions;
-    }
-    private Path playerFile(DateVoteEvent event, UUID player) {
-        return directory.resolve(event.fileId() + "-" + player + ".properties");
-    }
-    private Set<UUID> occurrences(Properties state) throws IOException {
-        Set<UUID> ids = new HashSet<>();
-        String raw = state.getProperty("seen", "");
-        if (!raw.isEmpty()) for (String id : raw.split(",", -1)) {
-            try { if (!ids.add(UUID.fromString(id))) throw new IOException("Duplicate stored occurrence"); }
-            catch (IllegalArgumentException invalid) { throw new IOException("Invalid stored occurrence", invalid); }
-            if (ids.size() > 4096) throw new IOException("Oversized event state");
-        }
-        return ids;
-    }
-    private int votes(Properties state) throws IOException {
-        String adjustment = state.getProperty("adjustment", "0");
-        if (!adjustment.matches("-?(0|[1-9][0-9]{0,3})")) throw new IOException("Invalid progress adjustment");
-        int offset = Integer.parseInt(adjustment);
-        int result = occurrences(state).size() + offset;
-        if (offset < -4096 || offset > 4096 || result < 0 || result > 4096)
-            throw new IOException("Invalid adjusted progress");
-        return result;
-    }
-    private Properties read(Path file) throws IOException {
-        Properties state = new Properties() {
-            @Override public synchronized Object put(Object key, Object value) {
-                if (containsKey(key)) throw new IllegalArgumentException("Duplicate stored field");
-                return super.put(key, value);
-            }
-        };
-        if (Files.notExists(file, LinkOption.NOFOLLOW_LINKS)) return new Properties();
-        if (Files.isSymbolicLink(directory)) throw new IOException("Unsafe milestone directory");
-        if (Files.isSymbolicLink(file) || !Files.isRegularFile(file, LinkOption.NOFOLLOW_LINKS) || Files.size(file) > 256 * 1024)
-            throw new IOException("Unsafe/oversized date milestone state");
-        try { state.load(new StringReader(Files.readString(file))); }
-        catch (IllegalArgumentException invalid) { throw new IOException("Malformed milestone state", invalid); }
-        if (file.getFileName().toString().equals("definitions.properties")) {
-            if (state.isEmpty() || state.size() > 1024) throw new IOException("Empty/oversized definitions; existing seals must not be reset");
-            for (String key : state.stringPropertyNames()) if (!key.matches("[A-Za-z0-9_-]{1,64}")
-                    || !state.getProperty(key).matches("[a-f0-9]{64}")) throw new IOException("Invalid definition state");
-        } else {
-            if (!state.containsKey("fingerprint") || !state.getProperty("fingerprint").matches("[a-f0-9]{64}")
-                    || !state.containsKey("seen") || state.size() > 67) throw new IOException("Incomplete milestone state");
-            Set<UUID> seen = occurrences(state);
-            votes(state);
-            for (String key : state.stringPropertyNames()) if (!key.equals("fingerprint") && !key.equals("seen")
-                    && !key.equals("adjustment")) {
-                if (!key.matches("award\\.[1-9][0-9]{0,3}")) throw new IOException("Unknown milestone state field");
-                int threshold = Integer.parseInt(key.substring(6));
-                if (threshold > 4096 || threshold > seen.size() && !state.containsKey("adjustment")
-                        || !(state.getProperty(key).equals("RESERVED") || state.getProperty(key).equals("SUBMITTED") || state.getProperty(key).equals("DEFERRED")))
-                    throw new IOException("Invalid award state");
-            }
-        }
-        Properties mutable = new Properties(); mutable.putAll(state);
-        return mutable;
-    }
-    protected void write(Path file, Properties state) throws IOException {
-        if (Files.isSymbolicLink(directory)) throw new IOException("Unsafe milestone directory");
-        Files.createDirectories(directory);
-        if (Files.isSymbolicLink(directory) || Files.isSymbolicLink(file)) throw new IOException("Unsafe milestone state path");
-        boolean newRecord = !file.getFileName().toString().equals("definitions.properties") && Files.notExists(file, LinkOption.NOFOLLOW_LINKS);
-        if (newRecord) {
-            int recordCount = 0;
-            try (var files = Files.newDirectoryStream(directory, "*.properties")) {
-                for (Path existing : files) if (!existing.getFileName().toString().equals("definitions.properties")) {
-                    if (++recordCount >= recordCapacity) throw new IOException("Milestone record capacity reached; existing progress retained");
-                }
-            }
-        }
-        StringWriter writer = new StringWriter(); state.store(writer, "DateVoteMilestones v1");
-        String text = writer.toString();
-        if (text.length() > 256 * 1024) throw new IOException("Oversized milestone state");
-        Path staged = Files.createTempFile(directory, "milestone-", ".tmp");
-        try { Files.writeString(staged, text); DurableFiles.publishStagedFile(staged, file); }
-        finally { Files.deleteIfExists(staged); }
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/specialrewards/datemilestones/DateVoteMilestoneConfig.java

@@ -1,94 +0,0 @@
-package com.bencodez.votingplugin.specialrewards.datemilestones;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-import java.util.regex.Pattern;
-import org.bukkit.configuration.ConfigurationSection;
-
-/** Bounded owner configuration; persistent award identities remain the numeric thresholds. */
-final class DateVoteMilestoneConfig {
-    record Reward(String key, boolean enabled) { }
-    private static final Pattern RANGE = Pattern.compile("(\\d+)\\s*\\.\\.\\s*(\\d+)(?:\\s+step\\s+(\\d+))?");
-    private DateVoteMilestoneConfig() { }
-
-    static Map<Integer, Reward> read(ConfigurationSection event) {
-        var section = event.getConfigurationSection("Milestones");
-        if (section == null || section.getKeys(false).isEmpty() || section.getKeys(false).size() > 64)
-            throw new IllegalArgumentException("Milestones requires 1–64 entries");
-        Map<Integer, Reward> result = new LinkedHashMap<>();
-        for (String key : section.getKeys(false)) {
-            var milestone = section.getConfigurationSection(key);
-            for (var entry : entry(key, milestone).entrySet()) {
-                if (result.putIfAbsent(entry.getKey(), entry.getValue()) != null)
-                    throw new IllegalArgumentException("Milestone thresholds must not overlap between entries");
-                if (result.size() > 64) throw new IllegalArgumentException("At most 64 thresholds per event");
-            }
-        }
-        return result;
-    }
-
-    static Map<Integer, Reward> entry(String key, ConfigurationSection section) {
-        if (!key.matches("[A-Za-z0-9_-]{1,64}") || section == null
-                || section.getConfigurationSection("Rewards") == null)
-            throw new IllegalArgumentException("Each milestone requires an ID and Rewards section");
-        if (section.contains("Enabled") && !(section.get("Enabled") instanceof Boolean))
-            throw new IllegalArgumentException("Milestone Enabled must be a boolean");
-        for (String unsupported : List.of("Total", "Group", "Limit")) {
-            if (section.contains(unsupported))
-                throw new IllegalArgumentException(unsupported + " is not supported for date milestones");
-        }
-        TreeSet<Integer> thresholds = new TreeSet<>();
-        if (!section.contains("At") && !section.contains("Every")) {
-            int value = integer(key, false);
-            if (!key.equals(Integer.toString(value))) throw new IllegalArgumentException("Legacy threshold must be canonical");
-            thresholds.add(value);
-        } else {
-            if (section.contains("At")) {
-                Object raw = section.get("At");
-                List<?> values = raw instanceof List<?> list ? list : java.util.Collections.singletonList(raw);
-                if (values.isEmpty() || values.size() > 64) throw new IllegalArgumentException("At requires 1–64 values");
-                for (Object value : values) addAt(thresholds, value);
-            }
-            if (section.contains("Every")) {
-                int every = integer(section.get("Every"), false);
-                for (int value = every; value <= 4096; value += every) add(thresholds, value);
-            }
-        }
-        Map<Integer, Reward> result = new LinkedHashMap<>();
-        for (int value : thresholds) result.put(value, new Reward(key, section.getBoolean("Enabled", true)));
-        return result;
-    }
-
-    private static void addAt(TreeSet<Integer> values, Object raw) {
-        if (raw instanceof String text) {
-            var range = RANGE.matcher(text.trim());
-            if (range.matches()) {
-                int start = integer(range.group(1), true), end = integer(range.group(2), true);
-                int step = range.group(3) == null ? 1 : integer(range.group(3), false);
-                int first = Math.min(start, end), last = Math.max(start, end);
-                for (int value = first; value <= last; value += step) add(values, value == 0 ? 1 : value);
-                return;
-            }
-        }
-        int value = integer(raw, true);
-        add(values, value == 0 ? 1 : value);
-    }
-
-    private static void add(TreeSet<Integer> values, int value) {
-        values.add(value);
-        if (values.size() > 64) throw new IllegalArgumentException("At most 64 thresholds per event");
-    }
-
-    private static int integer(Object raw, boolean zero) {
-        // Avoid Number.intValue truncation and YAML's boolean/string-list coercions.
-        if (!(raw instanceof Byte || raw instanceof Short || raw instanceof Integer || raw instanceof Long || raw instanceof String))
-            throw new IllegalArgumentException("Threshold must be an integer");
-        String text = raw.toString().trim();
-        if (!text.matches("\\d{1,4}")) throw new IllegalArgumentException("Threshold must be an integer from 1 to 4096");
-        int value = Integer.parseInt(text);
-        if (value < (zero ? 0 : 1) || value > 4096) throw new IllegalArgumentException("Threshold out of range");
-        return value;
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/specialrewards/datemilestones/DateVoteMilestones.java

@@ -1,548 +0,0 @@
-package com.bencodez.votingplugin.specialrewards.datemilestones;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.RejectedExecutionException;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Player;
-import org.bukkit.command.CommandSender;
-import com.bencodez.advancedcore.api.rewards.RewardOptions;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.core.datemilestones.DateVoteEvent;
-import com.bencodez.votingplugin.core.datemilestones.DateVoteProgressSnapshot;
-import com.bencodez.advancedcore.api.rewards.DirectlyDefinedReward;
-import com.bencodez.votingplugin.user.VotingPluginUser;
-import com.bencodez.votingplugin.util.BukkitCompletionScheduler;
-
-/** Owner-defined windows, independently accounted on one backend using original occurrence IDs. */
-public final class DateVoteMilestones {
-    private record Definition(DateVoteEvent event, YamlConfiguration rewards, java.util.Set<Integer> enabledThresholds,
-            java.util.Map<Integer, DateVoteMilestoneConfig.Reward> milestones, boolean countFakeVotes) { }
-    private final VotingPluginMain plugin;
-    private volatile List<Definition> definitions = List.of();
-    private final java.util.Set<UUID> pendingProgress = new java.util.HashSet<>();
-    private final java.util.concurrent.atomic.AtomicInteger deferredAccounting = new java.util.concurrent.atomic.AtomicInteger();
-    private final java.util.concurrent.atomic.AtomicInteger pendingAdministration = new java.util.concurrent.atomic.AtomicInteger();
-    private record PlaceholderIdentity(UUID player, boolean resolveName) { }
-    private final java.util.Map<PlaceholderIdentity, CachedProgress> placeholderCache = new java.util.LinkedHashMap<>(256, 0.75f, true);
-    private static final class ProgressRequest {
-        boolean invalidated;
-        UUID resolvedStorageId;
-    }
-    private final java.util.Map<PlaceholderIdentity, ProgressRequest> placeholderRequests = new java.util.HashMap<>();
-    private record CachedProgress(Object generation, long expires, UUID storageId, java.util.Map<String, DateVoteLedger.Progress> events) { }
-    private volatile Object generation = new Object();
-    private DateVoteLedger ledger;
-    public DateVoteMilestones(VotingPluginMain plugin) { this.plugin = plugin; }
-    private synchronized DateVoteLedger ledger() {
-        if (ledger == null) ledger = new DateVoteLedger(plugin.getDataFolder().toPath().resolve("date-vote-milestones"));
-        return ledger;
-    }
-    /** Configuration is already loaded; this method performs no disk access. */
-    public void reload() {
-        generation = null;
-        synchronized (placeholderCache) {
-            placeholderCache.clear();
-            // Queued/running refreshes still own their admission until their existing finally/rejection path releases it.
-            placeholderRequests.values().forEach(request -> request.invalidated = true);
-        }
-        List<Definition> loaded = new ArrayList<>();
-        YamlConfiguration rewards = new YamlConfiguration();
-        var root = plugin.getSpecialRewardsConfig().getData().getConfigurationSection("DateVoteMilestones");
-        if (root != null && !root.getKeys(false).isEmpty()) {
-            try { rewards.loadFromString(plugin.getSpecialRewardsConfig().getData().saveToString()); }
-            catch (org.bukkit.configuration.InvalidConfigurationException invalid) {
-                definitions = List.of(); generation = new Object();
-                plugin.getLogger().warning("DateVoteMilestones configuration snapshot invalid"); return;
-            }
-        }
-        int considered = 0;
-        if (root != null) for (String id : root.getKeys(false)) {
-            if (++considered > 64) { plugin.getLogger().warning("DateVoteMilestones supports at most 64 configured events"); break; }
-            try {
-                ConfigurationSection section = root.getConfigurationSection(id);
-                if (section == null) throw new IllegalArgumentException("Expected an event section");
-                registerRewardHandles(id, section, rewards);
-                DateVoteEvent event = parse(id, section);
-                if (plugin.getBungeeSettings().isUseBungeecoord() && event.accountingServer().isBlank())
-                    throw new IllegalArgumentException("Proxy events require one explicit AccountingServer and all-server identified delivery");
-                var configured = DateVoteMilestoneConfig.read(section);
-                var enabledThresholds = configured.entrySet().stream().filter(entry -> entry.getValue().enabled())
-                        .map(java.util.Map.Entry::getKey).collect(java.util.stream.Collectors.toUnmodifiableSet());
-                loaded.add(new Definition(event, rewards, enabledThresholds, java.util.Map.copyOf(configured),
-                        section.getBoolean("CountFakeVotes", true)));
-            } catch (Exception invalid) {
-                plugin.getLogger().warning("DateVoteMilestones " + id + " disabled: " + invalid.getMessage());
-            }
-        }
-        definitions = List.copyOf(loaded);
-        generation = new Object();
-    }
-    /** Queued rewards must resolve even when an accounting-only setting is invalid. */
-    private void registerRewardHandles(String id, ConfigurationSection section, YamlConfiguration rewards) {
-        String fileId = DateVoteEvent.fileId(id);
-        var milestones = section.getConfigurationSection("Milestones");
-        if (milestones == null) return;
-        java.util.Map<Integer, DateVoteMilestoneConfig.Reward> configuredRewards = new java.util.LinkedHashMap<>();
-        java.util.Set<Integer> ambiguous = new java.util.HashSet<>();
-        int count = 0;
-        for (String key : milestones.getKeys(false)) {
-            if (++count > 64) break;
-            try {
-                for (var entry : DateVoteMilestoneConfig.entry(key, milestones.getConfigurationSection(key)).entrySet()) {
-                    if (configuredRewards.size() >= 64 && !configuredRewards.containsKey(entry.getKey())) continue;
-                    if (configuredRewards.putIfAbsent(entry.getKey(), entry.getValue()) != null) ambiguous.add(entry.getKey());
-                }
-            } catch (IllegalArgumentException invalid) { /* Keep independent valid queued reward handles. */ }
-        }
-        for (var entry : configuredRewards.entrySet()) {
-            int threshold = entry.getKey();
-            if (ambiguous.contains(threshold)) continue;
-            String source = "DateVoteMilestones." + id + ".Milestones." + entry.getValue().key() + ".Rewards";
-            var configured = rewards.getConfigurationSection(source);
-            if (configured == null) continue;
-            String alias = "DateVoteMilestonesRuntime." + fileId + ".Milestones." + threshold + ".Rewards";
-            rewards.createSection(alias, configured.getValues(true));
-            plugin.addDirectlyDefinedRewards(new DirectlyDefinedReward(alias) {
-                private String sourcePath(String requested) {
-                    if (!requested.equals(alias) && !requested.startsWith(alias + "."))
-                        throw new IllegalArgumentException("Unexpected date milestone reward path");
-                    String current = currentRewardSource(plugin.getSpecialRewardsConfig().getData(), id, threshold);
-                    if (current == null) throw new IllegalStateException("Date milestone reward definition is unavailable");
-                    return current + requested.substring(alias.length());
-                }
-                @Override public ConfigurationSection getFileData() {
-                    YamlConfiguration data = new YamlConfiguration();
-                    var live = plugin.getSpecialRewardsConfig().getData();
-                    String currentSource = currentRewardSource(live, id, threshold);
-                    var current = currentSource == null ? null
-                            : live.getConfigurationSection(currentSource);
-                    if (current != null) data.createSection(alias, current.getValues(true));
-                    return data;
-                }
-                @Override public void createSection(String path) { plugin.getSpecialRewardsConfig().createSection(sourcePath(path)); }
-                @Override public void setData(String path, Object value) { plugin.getSpecialRewardsConfig().setValue(sourcePath(path), value); }
-                @Override public void save() { plugin.getSpecialRewardsConfig().saveData(); }
-            });
-        }
-    }
-    /** Old registry handles can outlive YAML replacement during reload; resolve by stable threshold. */
-    private static String currentRewardSource(ConfigurationSection live, String id, int threshold) {
-        var milestones = live.getConfigurationSection("DateVoteMilestones." + id + ".Milestones");
-        if (milestones == null) return null;
-        String found = null;
-        int count = 0;
-        for (String key : milestones.getKeys(false)) {
-            if (++count > 64) break;
-            try {
-                if (!DateVoteMilestoneConfig.entry(key, milestones.getConfigurationSection(key)).containsKey(threshold)) continue;
-                if (found != null) return null;
-                found = "DateVoteMilestones." + id + ".Milestones." + key + ".Rewards";
-            } catch (IllegalArgumentException invalid) { /* An unrelated invalid entry does not hide queued rewards. */ }
-        }
-        return found;
-    }
-    public static DateVoteEvent parse(String id, ConfigurationSection section) {
-        if (section.contains("CountFakeVotes") && !section.isBoolean("CountFakeVotes"))
-            throw new IllegalArgumentException("CountFakeVotes must be a boolean");
-        String zone = section.getString("Timezone");
-        String start = section.getString("Start"), end = section.getString("End");
-        var milestones = section.getConfigurationSection("Milestones");
-        if (zone == null || start == null || end == null || milestones == null)
-            throw new IllegalArgumentException("Start, End, Timezone and Milestones are required");
-        List<Integer> thresholds = new ArrayList<>(DateVoteMilestoneConfig.read(section).keySet());
-        Object rawSites = section.get("VoteSites");
-        if (rawSites != null && (!(rawSites instanceof List<?> sites)
-                || sites.stream().anyMatch(site -> !(site instanceof String))))
-            throw new IllegalArgumentException("VoteSites must be a list of configured site keys");
-        return new DateVoteEvent(id, section.getString("DisplayName", id), section.getBoolean("Enabled", false),
-                DateVoteEvent.timestamp(start, zone), DateVoteEvent.timestamp(end, zone), zone, thresholds,
-                new java.util.HashSet<>(section.getStringList("VoteSites")), section.getString("AccountingServer", ""));
-    }
-    static String path(DateVoteEvent event, int threshold) {
-        return "DateVoteMilestonesRuntime." + event.fileId() + ".Milestones." + threshold + ".Rewards";
-    }
-    /** Owner-thread extension events use the existing ordered storage worker without waiting on gameplay. */
-    public boolean deferAccepted(VotingPluginUser user, String site, UUID occurrence, long occurredAt,
-            boolean real, boolean proxy, boolean canonicalProxy, boolean targeted, boolean forceProxyRouting) {
-        if (plugin.getBungeeSettings().isUseBungeecoord() && !proxy) return true;
-        if (occurrence == null || occurredAt <= 0 || proxy && (!canonicalProxy || targeted)) return true;
-        List<Definition> snapshot = definitions;
-        if (snapshot.stream().noneMatch(definition -> definition.event().matches(occurredAt, site,
-                real || definition.countFakeVotes(), proxy,
-                plugin.getBungeeSettings().getServer()))) return true;
-        int pending;
-        do {
-            pending = deferredAccounting.get();
-            if (pending >= 64) {
-                plugin.getLogger().warning("DateVoteMilestones deferred accounting is busy; occurrence remains unconfirmed.");
-                return false;
-            }
-        } while (!deferredAccounting.compareAndSet(pending, pending + 1));
-        try {
-            plugin.getUserManager().getDataManager().getTimer().execute(() -> {
-                try {
-                    if (!plugin.isEnabled() || snapshot != definitions) return;
-                    accepted(user, site, occurrence, occurredAt, real, proxy, canonicalProxy, targeted, forceProxyRouting);
-                } finally { deferredAccounting.decrementAndGet(); }
-            });
-        } catch (RejectedExecutionException rejected) {
-            deferredAccounting.decrementAndGet();
-            plugin.getLogger().warning("DateVoteMilestones deferred accounting was rejected; occurrence remains unconfirmed.");
-        }
-        return false;
-    }
-    /** Called only from the asynchronous accepted-vote pipeline; never from navigation. */
-    public boolean accepted(VotingPluginUser user, String site, UUID occurrence, long occurredAt,
-            boolean real, boolean proxy, boolean canonicalProxy, boolean targeted, boolean forceProxyRouting) {
-        if (plugin.getBungeeSettings().isUseBungeecoord() && !proxy) return true;
-        if (occurrence == null || occurredAt <= 0 || proxy && (!canonicalProxy || targeted)) return true;
-        boolean recorded = true;
-        for (Definition definition : definitions) {
-            DateVoteEvent event = definition.event();
-            if (!event.matches(occurredAt, site, real || definition.countFakeVotes(), proxy,
-                    plugin.getBungeeSettings().getServer())) continue;
-            List<Integer> reached;
-            try {
-                reached = ledger().record(event, user.getJavaUUID(), occurrence, plugin.getOptions().isProcessRewards());
-                invalidateProgress(user.getJavaUUID());
-            } catch (IOException | RuntimeException failure) {
-                recorded = false;
-                plugin.getLogger().warning("DateVoteMilestones " + event.id() + " occurrence was not confirmed; proxy delivery must remain quarantined for accounting reconciliation: " + failure.getMessage());
-                continue;
-            }
-            try {
-                for (int threshold : reached) {
-                    if (!plugin.getOptions().isProcessRewards()) break;
-                    if (!definition.enabledThresholds().contains(threshold)) continue;
-                    var placeholders = new HashMap<String, String>();
-                    placeholders.put("DateVoteEvent", event.displayName());
-                    placeholders.put("DateVoteThreshold", Integer.toString(threshold));
-                    if (!ledger().reserve(event, user.getJavaUUID(), threshold)) continue;
-                    plugin.getRewardHandler().giveReward(user, definition.rewards(), path(event, threshold),
-                            new RewardOptions().setPrefix("DateVoteMilestones-" + event.id() + "-" + threshold)
-                                    .setServer(forceProxyRouting).setPlaceholders(placeholders));
-                    // Submission is not a transactional guarantee of arbitrary command execution.
-                    ledger().submitted(event, user.getJavaUUID(), threshold);
-                }
-            } catch (IOException | RuntimeException failure) {
-                plugin.getLogger().warning("DateVoteMilestones " + event.id() + " accounting/reward submission failed; progress retained for review: " + failure.getMessage());
-            }
-        }
-        return recorded;
-    }
-    public enum AdminAction { Status, Preview, SetVotes, Force, ForceNoLimits }
-
-    /** Admission is not success: all identity/storage/reward work runs on the ordered worker. */
-    public void administer(CommandSender sender, AdminAction action, String player, String eventId, String argument) {
-        Object epoch = generation;
-        dispatchAdmin(sender, action, () -> {
-            if (!current(epoch) || !adminAllowed(sender, action)) return;
-            if (!validPlayer(player) || eventId == null || !eventId.matches("[A-Za-z0-9_-]{1,64}")) {
-                sender.sendMessage("Invalid exact player or event ID."); return;
-            }
-            int count;
-            do { count = pendingAdministration.get();
-                if (count >= 64) { sender.sendMessage("Date milestone administration is busy. Try again shortly."); return; }
-            } while (!pendingAdministration.compareAndSet(count, count + 1));
-            try {
-                plugin.getUserManager().getDataManager().getTimer().execute(() -> {
-                    try {
-                        if (!current(epoch)) return;
-                        List<String> result = administerOnWorker(action, player, eventId, argument, epoch);
-                        dispatchAdmin(sender, action, () -> {
-                            if (current(epoch) && adminAllowed(sender, action)) result.forEach(sender::sendMessage);
-                        });
-                    } catch (IOException | RuntimeException failure) {
-                        dispatchAdmin(sender, action, () -> {
-                            if (current(epoch) && adminAllowed(sender, action))
-                                sender.sendMessage("Date milestone operation failed; inspect retained progress before retrying rewards.");
-                        });
-                    } finally { pendingAdministration.decrementAndGet(); }
-                });
-            } catch (RejectedExecutionException unavailable) {
-                pendingAdministration.decrementAndGet();
-                sender.sendMessage("Date milestone storage is unavailable; nothing was submitted.");
-            }
-        });
-    }
-    private boolean current(Object epoch) {
-        return epoch != null && epoch == generation && plugin.isEnabled() && plugin.getDateVoteMilestones() == this;
-    }
-    private static boolean validPlayer(String player) {
-        return player != null && (player.matches("[A-Za-z0-9_]{1,16}")
-                || player.matches("[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}"));
-    }
-    private boolean adminAllowed(CommandSender sender, AdminAction action) {
-        return (!(sender instanceof Player p) || p.isOnline()) && (sender.hasPermission("VotingPlugin.Admin")
-                || sender.hasPermission("VotingPlugin.Commands.AdminVote.DateVoteMilestone." + action.name()));
-    }
-    private void dispatchAdmin(CommandSender sender, AdminAction action, Runnable effect) {
-        Player player = sender instanceof Player p ? p : null;
-        Runnable checked = () -> { if (plugin.isEnabled() && adminAllowed(sender, action)) effect.run(); };
-        BukkitCompletionScheduler.run(plugin, player, checked, player == null ? checked : () -> { }, () -> { });
-    }
-    private List<String> administerOnWorker(AdminAction action, String player, String eventId, String argument,
-            Object epoch) throws IOException {
-        Definition definition = definitions.stream().filter(d -> d.event().id().equals(eventId)).findFirst().orElse(null);
-        if (definition == null) return List.of("Unknown or invalid date event ID.");
-        DateVoteEvent event = definition.event();
-        boolean network = plugin.getBungeeSettings().isUseBungeecoord();
-        if (network && !event.accountingServer().equals(plugin.getBungeeSettings().getServer()))
-            return List.of("Progress is remote; run this command on the configured AccountingServer.");
-        Integer value = null;
-        List<Integer> selected = List.of();
-        if (action == AdminAction.SetVotes) {
-            if (argument == null || !argument.matches("0|[1-9][0-9]{0,3}") || Integer.parseInt(argument) > 4096)
-                return List.of("Votes must be an integer from 0 to 4096.");
-            value = Integer.parseInt(argument);
-        } else if (action == AdminAction.Force || action == AdminAction.ForceNoLimits) {
-            if (!event.enabled() || !plugin.getOptions().isProcessRewards())
-                return List.of("Event or reward processing is disabled; no reward was submitted.");
-            if (argument == null || !argument.matches("[A-Za-z0-9_-]{1,64}")) return List.of("Invalid milestone ID or threshold.");
-            String selector = argument;
-            // A named At/Every entry can expand into several independently fenced thresholds.
-            selected = event.thresholds().stream().filter(n -> definition.milestones().get(n).key().equals(selector)).toList();
-            if (selected.isEmpty()) selected = event.thresholds().stream().filter(n -> Integer.toString(n).equals(selector)).toList();
-            if (selected.isEmpty()) return List.of("Unknown milestone ID or threshold.");
-        }
-        VotingPluginUser user = player.length() == 36
-                ? plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(player), false)
-                : plugin.getVotingPluginUserManager().getVotingPluginUser(player);
-        UUID storageId = user.getJavaUUID();
-        if (!current(epoch)) return List.of();
-        if (action == AdminAction.SetVotes) {
-            var result = ledger().setVotes(event, storageId, value);
-            invalidateProgress(storageId);
-            return List.of("Date event " + eventId + " votes set to " + result.votes()
-                    + "; receipt IDs and reward fences retained. No rewards were submitted.");
-        }
-        if (action == AdminAction.Force || action == AdminAction.ForceNoLimits) {
-            int submitted = 0;
-            for (int threshold : selected) {
-                if (!current(epoch) || !plugin.getOptions().isProcessRewards()) break;
-                if (!definition.enabledThresholds().contains(threshold)) continue;
-                if (!ledger().reserveForced(event, storageId, threshold, action == AdminAction.ForceNoLimits)) continue;
-                invalidateProgress(storageId);
-                var placeholders = new HashMap<String, String>();
-                placeholders.put("DateVoteEvent", event.displayName());
-                placeholders.put("DateVoteThreshold", Integer.toString(threshold));
-                plugin.getRewardHandler().giveReward(user, definition.rewards(), path(event, threshold),
-                        new RewardOptions().setPrefix("DateVoteMilestones-" + event.id() + "-" + threshold)
-                                .setServer(network).setPlaceholders(placeholders));
-                ledger().submitted(event, storageId, threshold);
-                submitted++;
-            }
-            return List.of("Date event " + eventId + ": submitted " + submitted + " of " + selected.size()
-                    + " selected thresholds; disabled or fenced thresholds skipped. Vote count unchanged.");
-        }
-        var progress = ledger().progress(event, storageId);
-        List<String> lines = new ArrayList<>();
-        lines.add("Date event " + eventId + ": votes=" + progress.votes() + ", CountFakeVotes=" + definition.countFakeVotes()
-                + ", status=" + (!event.enabled() ? "disabled" : System.currentTimeMillis() < event.start() ? "upcoming"
-                        : System.currentTimeMillis() >= event.end() ? "ended" : "active")
-                + ". Stored in date-vote-milestones/<event-file-id>-<player-uuid>.properties.");
-        for (int threshold : event.thresholds()) lines.add("Milestone " + definition.milestones().get(threshold).key()
-                + " at " + threshold + ": " + (progress.reservedAwards().contains(threshold) ? "pending review"
-                        : progress.submittedAwards().contains(threshold) ? "submitted"
-                        : progress.deferredAwards().contains(threshold) ? "deferred" : "not reached")
-                + (definition.enabledThresholds().contains(threshold) ? "" : " (disabled)"));
-        return List.copyOf(lines);
-    }
-    private void invalidateProgress(UUID player) {
-        synchronized (placeholderCache) {
-            placeholderCache.entrySet().removeIf(entry -> player.equals(entry.getValue().storageId()));
-            // Unresolved names have not read the ledger yet; their later read
-            // will observe this mutation. Once resolved, fence matching reads.
-            placeholderRequests.values().forEach(request -> {
-                if (player.equals(request.resolvedStorageId)) request.invalidated = true;
-            });
-        }
-    }
-
-    /** Nonblocking projection using a previously captured storage identity. */
-    public String placeholder(UUID player, String request) {
-        return placeholder(player, null, request);
-    }
-
-    /** Named offline identity is resolved only on the persistence worker. */
-    public String placeholder(UUID player, java.util.function.Supplier<String> offlineName, String request) {
-        if (player == null || request == null || request.length() > 100 || !plugin.isEnabled()) return "unavailable";
-        PlaceholderIdentity identity = new PlaceholderIdentity(player, offlineName != null);
-        int split = request.indexOf('_');
-        if (split < 1) return "invalid";
-        String metric = request.substring(0, split).toLowerCase(java.util.Locale.ROOT);
-        String id = request.substring(split + 1);
-        int threshold = -1;
-        if (metric.equals("award")) {
-            split = id.indexOf('_');
-            if (split < 1 || !id.substring(0, split).matches("[1-9][0-9]{0,3}")) return "invalid";
-            threshold = Integer.parseInt(id.substring(0, split)); id = id.substring(split + 1);
-        } else if (!List.of("votes", "next", "status").contains(metric)) return "invalid";
-        String eventId = id;
-        Definition definition = definitions.stream().filter(d -> d.event().id().equals(eventId)).findFirst().orElse(null);
-        if (definition == null) return "invalid";
-        DateVoteEvent event = definition.event();
-        if (metric.equals("status")) return !event.enabled() ? "disabled" : System.currentTimeMillis() < event.start()
-                ? "upcoming" : System.currentTimeMillis() >= event.end() ? "ended" : "active";
-        if (metric.equals("award") && !event.thresholds().contains(threshold)) return "invalid";
-        if (plugin.getBungeeSettings().isUseBungeecoord() && !event.accountingServer().equals(plugin.getBungeeSettings().getServer()))
-            return "remote";
-        Object epoch = generation;
-        if (epoch == null) return "unavailable";
-        CachedProgress cached;
-        ProgressRequest launch = null;
-        synchronized (placeholderCache) {
-            cached = placeholderCache.get(identity);
-            if (cached == null || cached.generation() != epoch || System.nanoTime() >= cached.expires()) {
-                cached = null;
-                if (!placeholderRequests.containsKey(identity)) {
-                    if (placeholderRequests.size() >= 64) return "unavailable";
-                    launch = new ProgressRequest();
-                    if (!identity.resolveName()) launch.resolvedStorageId = player;
-                    placeholderRequests.put(identity, launch);
-                }
-            }
-        }
-        if (launch != null && !refreshPlaceholder(identity, offlineName, epoch, definitions, launch)) return "unavailable";
-        if (cached == null) return "loading";
-        var progress = cached.events().get(eventId);
-        if (progress == null) return "unavailable";
-        if (metric.equals("votes")) return Integer.toString(progress.votes());
-        if (metric.equals("next")) return event.thresholds().stream().filter(n -> n > progress.votes()
-                && definition.enabledThresholds().contains(n)).findFirst().map(Object::toString).orElse("0");
-        return progress.reservedAwards().contains(threshold) ? "pending_review" : progress.submittedAwards().contains(threshold)
-                ? "submitted" : progress.deferredAwards().contains(threshold) ? "deferred" : "not_reached";
-    }
-    private boolean refreshPlaceholder(PlaceholderIdentity identity, java.util.function.Supplier<String> offlineName, Object epoch, List<Definition> snapshot, ProgressRequest request) {
-        try {
-            plugin.getUserManager().getDataManager().getTimer().execute(() -> {
-                try {
-                    if (!current(epoch)) return;
-                    UUID storageId;
-                    try {
-                        String name = offlineName == null ? null : offlineName.get();
-                        storageId = name == null || name.isBlank() ? identity.player()
-                                : plugin.getVotingPluginUserManager().getVotingPluginUser(identity.player(), name).getJavaUUID();
-                        if (storageId == null) throw new IllegalStateException("Missing storage identity");
-                        synchronized (placeholderCache) {
-                            if (!current(epoch) || request.invalidated || placeholderRequests.get(identity) != request) return;
-                            request.resolvedStorageId = storageId;
-                        }
-                    } catch (RuntimeException unavailable) {
-                        synchronized (placeholderCache) {
-                            if (current(epoch) && !request.invalidated && placeholderRequests.get(identity) == request) {
-                                if (placeholderCache.size() >= 256) placeholderCache.remove(placeholderCache.keySet().iterator().next());
-                                placeholderCache.put(identity, new CachedProgress(epoch, System.nanoTime() + 1_000_000_000L, null, java.util.Map.of()));
-                            }
-                        }
-                        return;
-                    }
-                    java.util.Map<String, DateVoteLedger.Progress> results = new HashMap<>();
-                    for (Definition definition : snapshot) {
-                        var event = definition.event();
-                        if (plugin.getBungeeSettings().isUseBungeecoord()
-                                && !event.accountingServer().equals(plugin.getBungeeSettings().getServer())) continue;
-                        try { results.put(event.id(), ledger().progress(event, storageId)); }
-                        catch (IOException | RuntimeException unavailable) { /* Missing entry means unavailable, never zero. */ }
-                    }
-                    synchronized (placeholderCache) {
-                        if (!current(epoch) || request.invalidated || placeholderRequests.get(identity) != request) return;
-                        if (placeholderCache.size() >= 256) placeholderCache.remove(placeholderCache.keySet().iterator().next());
-                        placeholderCache.put(identity, new CachedProgress(epoch, System.nanoTime() + 5_000_000_000L, storageId, java.util.Map.copyOf(results)));
-                    }
-                } finally { synchronized (placeholderCache) { placeholderRequests.remove(identity, request); } }
-            });
-            return true;
-        } catch (RuntimeException unavailable) {
-            synchronized (placeholderCache) {
-                if (current(epoch) && placeholderRequests.get(identity) == request) {
-                    if (placeholderCache.size() >= 256) placeholderCache.remove(placeholderCache.keySet().iterator().next());
-                    placeholderCache.put(identity, new CachedProgress(epoch, System.nanoTime() + 1_000_000_000L, null, java.util.Map.of()));
-                }
-                placeholderRequests.remove(identity, request);
-            }
-            return false;
-        }
-    }
-    public void progress(Player player) {
-        progress(player, (view, current) -> com.bencodez.votingplugin.commands.gui.player.DateVoteEventsMenu.open(plugin, player, view, current));
-    }
-    /** Display is an entity-owned effect; identity resolution and ledger reads stay on the storage worker. */
-    void progress(Player player, java.util.function.BiConsumer<DateVoteProgressSnapshot, java.util.function.BooleanSupplier> display) {
-        BukkitCompletionScheduler.run(plugin, player, () -> {
-            UUID uuid = player.getUniqueId();
-            String playerName = player.getName();
-            if (!canView(player)) return;
-            synchronized (pendingProgress) {
-                if (pendingProgress.contains(uuid) || pendingProgress.size() >= 64) {
-                    player.sendMessage("Date voting progress is already being checked or busy. Try again shortly."); return;
-                }
-                pendingProgress.add(uuid);
-            }
-            List<Definition> snapshot = definitions;
-            try {
-                plugin.getUserManager().getDataManager().getTimer().execute(() -> {
-                    try {
-                    if (snapshot != definitions || !plugin.isEnabled()) return;
-                    boolean proxyBackend = plugin.getBungeeSettings().isUseBungeecoord();
-                    String server = plugin.getBungeeSettings().getServer();
-                    boolean localProgress = snapshot.stream().anyMatch(d -> !proxyBackend || d.event().accountingServer().equals(server));
-                    UUID storageId = !localProgress ? uuid
-                            : plugin.getVotingPluginUserManager().getVotingPluginUser(uuid, playerName).getJavaUUID();
-                    List<DateVoteProgressSnapshot.Event> events = new ArrayList<>();
-                    long now = System.currentTimeMillis();
-                    for (Definition definition : snapshot) {
-                        var event = definition.event();
-                        var milestones = event.thresholds().stream().map(threshold -> {
-                            var configured = definition.milestones().get(threshold);
-                            var rewards = definition.rewards().getConfigurationSection(path(event, threshold));
-                            var types = rewards == null ? List.<String>of() : rewards.getKeys(false).stream()
-                                    .filter(key -> key.length() <= 64).limit(16).toList();
-                            return new DateVoteProgressSnapshot.Milestone(threshold, configured.key(), configured.enabled(), types);
-                        }).toList();
-                        if (proxyBackend && !event.accountingServer().equals(server)) {
-                            events.add(view(event, DateVoteProgressSnapshot.Availability.REMOTE, null, milestones)); continue;
-                        }
-                        try {
-                            var progress = ledger().progress(event, storageId);
-                            events.add(view(event, DateVoteProgressSnapshot.Availability.OWNED, progress, milestones));
-                        } catch (IOException failure) {
-                            events.add(view(event, DateVoteProgressSnapshot.Availability.UNAVAILABLE, null, milestones));
-                        }
-                    }
-                    var result = new DateVoteProgressSnapshot(now, events);
-                    java.util.function.BooleanSupplier current = () -> canView(player) && snapshot == definitions
-                            && plugin.getDateVoteMilestones() == this;
-                    BukkitCompletionScheduler.run(plugin, player, () -> {
-                        if (current.getAsBoolean()) display.accept(result, current);
-                    }, () -> { }, () -> { });
-                    } catch (RuntimeException unavailable) {
-                        BukkitCompletionScheduler.run(plugin, player, () -> {
-                            if (canView(player) && snapshot == definitions)
-                                player.sendMessage("Date voting progress is temporarily unavailable.");
-                        }, () -> { }, () -> { });
-                    } finally { synchronized (pendingProgress) { pendingProgress.remove(uuid); } }
-                });
-            } catch (RejectedExecutionException unavailable) {
-                synchronized (pendingProgress) { pendingProgress.remove(uuid); }
-                player.sendMessage("Date voting progress is temporarily unavailable.");
-            }
-        }, () -> { }, () -> { });
-    }
-    private boolean canView(Player player) {
-        return plugin.isEnabled() && player.isOnline()
-                && (player.hasPermission("VotingPlugin.Commands.Vote.DateEvents") || player.hasPermission("VotingPlugin.Player"));
-    }
-    private static DateVoteProgressSnapshot.Event view(DateVoteEvent event, DateVoteProgressSnapshot.Availability availability,
-            DateVoteLedger.Progress progress, List<DateVoteProgressSnapshot.Milestone> milestones) {
-        return new DateVoteProgressSnapshot.Event(event, availability, progress == null ? 0 : progress.votes(),
-                progress == null ? java.util.Set.of() : progress.submittedAwards(),
-                progress == null ? java.util.Set.of() : progress.deferredAwards(),
-                progress == null ? java.util.Set.of() : progress.reservedAwards(), milestones);
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/specialrewards/voteparty/VoteParty.java

@@ -146,9 +146,8 @@ public class VoteParty implements Listener {
 	public void commandVoteParty(CommandSender sender) {
 		if (plugin.getSpecialRewardsConfig().isVotePartyEnabled()) {
 			ArrayList<String> msg = plugin.getConfigFile().getFormatCommandsVoteParty();
-			var display = plugin.getServerData().getVotePartyDisplay();
-			int votesRequired = display.required(plugin.getSpecialRewardsConfig().getVotePartyVotesRequired());
-			int votes = display.total();
+			int votesRequired = getVotesRequired();
+			int votes = getTotalVotes();
 			int neededVotes = votesRequired - votes;
 			HashMap<String, String> placeholders = new HashMap<>();
 			placeholders.put("votesrequired", "" + votesRequired);
@@ -244,16 +243,7 @@ public class VoteParty implements Listener {
 	 */
 	public void giveRewards(VotingPluginUser orgUser, boolean forceBungee) {
 		rewardHandler.giveRewards(orgUser, forceBungee);
-		// Clear this party's recipient list immediately, as before. Delaying it
-		// would risk wiping voters recorded for the next party.
-		setVotedUsers(new ArrayList<>());
-		// Shared-MySQL recipients capture eligibility on AdvancedCore's ordered
-		// storage worker. Only the persisted per-user counter wipe must run
-		// behind those reads; it must not overtake deferred eligibility checks.
-		com.bencodez.advancedcore.api.user.usercache.UserDataManager manager =
-				plugin.getUserManager().getDataManager();
-		if (manager != null && manager.deferSharedStorageWork(this::resetVotePartyCount)) return;
-		resetVotePartyCount();
+		reset(false);
 	}
 
 	/**

VotingPlugin/src/main/java/com/bencodez/votingplugin/specialrewards/voteparty/VotePartyRewardHandler.java

@@ -3,8 +3,6 @@ package com.bencodez.votingplugin.specialrewards.voteparty;
 import java.util.ArrayList;
 import java.util.UUID;
 import java.util.concurrent.ThreadLocalRandom;
-import java.util.function.Consumer;
-import java.util.function.Supplier;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -13,7 +11,6 @@ import com.bencodez.advancedcore.api.messages.PlaceholderUtils;
 import com.bencodez.advancedcore.api.misc.MiscUtils;
 import com.bencodez.advancedcore.api.rewards.RewardBuilder;
 import com.bencodez.advancedcore.api.user.UserDataFetchMode;
-import com.bencodez.advancedcore.api.user.usercache.UserDataManager;
 import com.bencodez.simpleapi.array.ArrayUtils;
 import com.bencodez.votingplugin.VotingPluginMain;
 import com.bencodez.votingplugin.user.VotingPluginUser;
@@ -40,15 +37,10 @@ public final class VotePartyRewardHandler {
 	}
 
 	public void giveReward(VotingPluginUser user, boolean online, boolean useBungee) {
-		givePreparedReward(user, online, useBungee, !plugin.getServerData().isLastVotePartySameDay());
-	}
-
-	private void givePreparedReward(VotingPluginUser user, boolean online, boolean useBungee,
-			boolean firstVotePartyToday) {
 		new RewardBuilder(plugin.getSpecialRewardsConfig().getData(),
 				plugin.getSpecialRewardsConfig().getVotePartyRewardsPath()).setOnline(online)
 				.withPlaceHolder("VotesRequired", "" + plugin.getSpecialRewardsConfig().getVotePartyVotesRequired())
-				.withPlaceHolder("FirstVotePartyToday", "" + firstVotePartyToday)
+				.withPlaceHolder("FirstVotePartyToday", "" + !plugin.getServerData().isLastVotePartySameDay())
 				.setServer(useBungee).send(user);
 	}
 
@@ -90,14 +82,13 @@ public final class VotePartyRewardHandler {
 		}
 	}
 
-	/** Dispatch to every eligible user, preserving each online player's scheduler owner. */
 	private void giveAllPlayers(VotingPluginUser triggeringUser, boolean forceBungee) {
 		plugin.debug("Trying to give all players vote party");
 		ArrayList<String> alreadyGiven = new ArrayList<>();
 		for (Player player : Bukkit.getOnlinePlayers()) {
 			VotingPluginUser user = resolveUser(triggeringUser, player.getUniqueId(), player);
 			if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
-				giveRewardWhenLoaded(user, forceBungee, player);
+				voteParty.giveReward(user, forceBungee);
 			}
 			alreadyGiven.add(player.getUniqueId().toString());
 		}
@@ -108,115 +99,30 @@ public final class VotePartyRewardHandler {
 			}
 			VotingPluginUser user = resolveUser(triggeringUser, UUID.fromString(uuid), null);
 			if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
-				giveRewardWhenLoaded(user, forceBungee, null);
+				voteParty.giveReward(user, forceBungee);
 			}
 		}
 	}
 
-	/** Dispatch to users recorded for this party before its voter list is reset. */
 	private void giveVotedPlayers(VotingPluginUser triggeringUser, boolean forceBungee) {
 		plugin.debug("Trying to give all voted players vote party");
 		plugin.debug(ArrayUtils.makeStringList(voteParty.getVotedUsers()));
 		for (String uuid : voteParty.getVotedUsers()) {
 			VotingPluginUser user = resolveUser(triggeringUser, UUID.fromString(uuid), null);
 			if (!plugin.getSpecialRewardsConfig().isVotePartyGiveOnlinePlayersOnly() || user.isOnline()) {
-				// Capture a live player only on a platform-owned thread. The vote path
-				// can also originate from a storage worker, where Bukkit lookups are unsafe.
-				UserDataManager manager = sharedDataManager();
-				Player owner = manager != null && manager.isPlatformOwnedThread()
-						? Bukkit.getPlayer(user.getJavaUUID()) : null;
-				giveRewardWhenLoaded(user, forceBungee, owner);
+				voteParty.giveReward(user, forceBungee);
 			}
 		}
 	}
 
-	/** Resolve a recipient without forcing an uncached SQL read for shared storage. */
 	private VotingPluginUser resolveUser(VotingPluginUser triggeringUser, UUID uuid, Player onlinePlayer) {
-		VotingPluginUser user = triggeringUser != null && triggeringUser.getJavaUUID().equals(uuid)
-				? triggeringUser
-				: onlinePlayer == null
-						? plugin.getVotingPluginUserManager().getVotingPluginUser(uuid, true)
-						: plugin.getVotingPluginUserManager().getVotingPluginUser(onlinePlayer);
-		if (sharedDataManager() != null) {
-			// Reward placeholders need the published shared cache, including for the triggering user.
-			user.userDataFetechMode(UserDataFetchMode.DEFAULT);
-		} else if (user != triggeringUser) {
-			// Preserve direct reads for file/SQLite storage.
-			user.userDataFetechMode(UserDataFetchMode.NO_CACHE);
+		if (triggeringUser != null && triggeringUser.getJavaUUID().equals(uuid)) {
+			return triggeringUser;
 		}
+		VotingPluginUser user = onlinePlayer == null
+				? plugin.getVotingPluginUserManager().getVotingPluginUser(uuid)
+				: plugin.getVotingPluginUserManager().getVotingPluginUser(onlinePlayer);
+		user.userDataFetechMode(UserDataFetchMode.NO_CACHE);
 		return user;
 	}
-
-	/** Returns the active shared SQL manager or null for nonshared storage. */
-	private UserDataManager sharedDataManager() {
-		UserDataManager manager = plugin.getUserManager().getDataManager();
-		return manager != null && manager.hasSharedSqlBackend() ? manager : null;
-	}
-
-	/**
-	 * Capture shared SQL reward eligibility on AdvancedCore's storage worker.
-	 * This must finish before the VoteParty counter wipe is enqueued on that worker.
-	 * A caller running on a platform thread must not check even a published cache
-	 * directly because checking publication takes the cache's synchronized monitor.
-	 */
-	private void giveRewardWhenLoaded(VotingPluginUser user, boolean forceBungee, Player callbackOwner) {
-		UserDataManager manager = sharedDataManager();
-		if (manager == null) {
-			voteParty.giveReward(user, forceBungee);
-			return;
-		}
-		UUID uuid = user.getJavaUUID();
-
-		// VoteParty clears per-user counters and updates the last-party timestamp
-		// after dispatch. Capture these decisions before that reset, not when the
-		// deferred reward finally runs on the player scheduler.
-		final boolean firstPartyToday = !plugin.getServerData().isLastVotePartySameDay();
-		final int userVotesRequired = plugin.getSpecialRewardsConfig().getVotePartyUserVotesRequired();
-
-		// A mapped cache entry can still be an *unpublished* placeholder, so
-		// cacheUserIfNeeded() alone would not make reward placeholders safe to read.
-		Supplier<Integer> populate = () -> {
-			if (manager.getPublishedCache(uuid) == null) manager.cacheUser(uuid, null);
-			if (manager.getPublishedCache(uuid) == null) return null;
-			// Read eligibility on the storage worker, before VoteParty resets counters.
-			return userVotesRequired > 0 ? user.getVotePartyVotes() : 0;
-		};
-		Consumer<Integer> success = votes -> {
-			if (votes == null) {
-				plugin.getLogger().warning("VoteParty reward not sent: shared user data is unavailable for " + uuid);
-				return;
-			}
-			if (votes < userVotesRequired) return;
-
-			// Eligibility was captured on the storage worker before reset. Do not
-			// re-read the cache on a platform thread or re-check reset counters.
-			Runnable deliver = () -> givePreparedReward(user, user.isOnline(), forceBungee, firstPartyToday);
-			if (callbackOwner != null) {
-				deliver.run();
-			} else {
-				// A worker-originated vote has no captured Player. Its completion is
-				// on the global platform scheduler; discover a live owner there.
-				Player online = Bukkit.getPlayer(uuid);
-				if (online == null) deliver.run();
-				else plugin.getBukkitScheduler().runTask(plugin, deliver, online);
-			}
-		};
-		Consumer<Throwable> failure = error -> plugin.getLogger()
-				.warning("Failed to load shared user data for VoteParty reward " + uuid + ": " + error);
-
-		try {
-			if (manager.deferSharedStorageResult(populate, success, failure, callbackOwner)) return;
-
-			// Called from a non-platform worker: storage reads are safe here, but reward
-			// effects still need the Bukkit/Folia scheduler.
-			Integer ready = populate.get();
-			if (callbackOwner != null) {
-				plugin.getBukkitScheduler().runTask(plugin, () -> success.accept(ready), callbackOwner);
-			} else {
-				plugin.getBukkitScheduler().runTask(plugin, () -> success.accept(ready));
-			}
-		} catch (RuntimeException | Error error) {
-			failure.accept(error);
-		}
-	}
 }

VotingPlugin/src/main/java/com/bencodez/votingplugin/specialrewards/voteparty/VotePartyState.java

@@ -24,7 +24,8 @@ public final class VotePartyState {
 	}
 
 	public void setTotalVotes(int value) {
-		plugin.getServerData().setInt(TOTAL_PATH, value);
+		plugin.getServerData().getData().set(TOTAL_PATH, value);
+		plugin.getServerData().saveData();
 	}
 
 	public List<String> getVotedUsers() {
@@ -33,7 +34,8 @@ public final class VotePartyState {
 	}
 
 	public void setVotedUsers(List<String> users) {
-		plugin.getServerData().setStringList(VOTED_PATH, users);
+		plugin.getServerData().getData().set(VOTED_PATH, users);
+		plugin.getServerData().saveData();
 	}
 
 	public int getVotesRequired() {

VotingPlugin/src/main/java/com/bencodez/votingplugin/specialrewards/votestreak/VoteStreakHandler.java

@@ -40,7 +40,6 @@ public class VoteStreakHandler {
 	private final Map<String, VoteStreakDefinition> byId = new LinkedHashMap<>();
 	private final Map<String, VoteStreakDefinition> byProgressGroup = new LinkedHashMap<>();
 	private final List<VoteStreakDefinition> ordered = new ArrayList<>();
-	private volatile List<VoteStreakDefinition> displayDefinitions = List.of();
 
 	public VoteStreakHandler(VotingPluginMain plugin) {
 		this.plugin = plugin;
@@ -57,26 +56,6 @@ public class VoteStreakHandler {
 		// VoteStreak definitions live in specialrewards.yml now (Option B)
 		ConfigurationSection root = plugin.getSpecialRewardsConfig().getData();
 		new VoteStreakConfigLoader().load(root);
-		displayDefinitions = ordered.stream().filter(VoteStreakDefinition::isEnabled).toList();
-	}
-
-	/** Worker-only, observational view. Does not advance periods, save state or execute rewards. */
-	public com.bencodez.votingplugin.streaks.VoteStreaksSnapshot snapshotForDisplay(VotingPluginUser user) {
-		var definitions = displayDefinitions;
-		var periods = List.of(
-				new com.bencodez.votingplugin.streaks.VoteStreaksSnapshot.Period(VoteStreakType.DAILY, user.getDayVoteStreak(), user.getBestDayVoteStreak()),
-				new com.bencodez.votingplugin.streaks.VoteStreaksSnapshot.Period(VoteStreakType.WEEKLY, user.getWeekVoteStreak(), user.getBestWeekVoteStreak()),
-				new com.bencodez.votingplugin.streaks.VoteStreaksSnapshot.Period(VoteStreakType.MONTHLY, user.getMonthVoteStreak(), user.getBestMonthVoteStreak()));
-		var states = new LinkedHashMap<String, StreakState>();
-		var rows = new ArrayList<com.bencodez.votingplugin.streaks.VoteStreaksSnapshot.Milestone>();
-		for (var definition : definitions) {
-			if (rows.size() >= com.bencodez.votingplugin.streaks.VoteStreaksSnapshot.MAX_MILESTONES) break;
-			var state = states.computeIfAbsent(getColumnName(definition), ignored -> readState(user, definition));
-			String label = definition.getId().codePoints().limit(80).collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append).toString();
-			rows.add(new com.bencodez.votingplugin.streaks.VoteStreaksSnapshot.Milestone(label, definition.getType(), state.streakCount,
-					state.bestStreakCount, definition.getRequiredAmount(), definition.getVotesRequired(), definition.isRecurring()));
-		}
-		return new com.bencodez.votingplugin.streaks.VoteStreaksSnapshot(periods, rows, definitions.size() > rows.size());
 	}
 
 	public List<VoteStreakDefinition> getDefinitions() {

VotingPlugin/src/main/java/com/bencodez/votingplugin/streaks/VoteStreaksCommand.java

@@ -1,20 +0,0 @@
-package com.bencodez.votingplugin.streaks;
-
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import com.bencodez.advancedcore.api.command.CommandHandler;
-import com.bencodez.votingplugin.VotingPluginMain;
-
-public final class VoteStreaksCommand {
-    private VoteStreaksCommand() { }
-    public static void register(VotingPluginMain plugin) {
-        plugin.getVoteCommand().add(new CommandHandler(plugin, new String[] { "Streaks" },
-                VoteStreaksMenu.PERMISSION + "|VotingPlugin.Player", "View your vote streak progression", false) {
-            @Override public void execute(CommandSender sender, String[] args) {
-                if (sender instanceof Player player && plugin.getVoteStreaksMenu() != null) {
-                    plugin.getVoteStreaksMenu().open(player);
-                }
-            }
-        });
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/streaks/VoteStreaksMenu.java

@@ -1,277 +0,0 @@
-package com.bencodez.votingplugin.streaks;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-import java.util.function.BiFunction;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.PlayerDeathEvent;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryCloseEvent;
-import org.bukkit.event.inventory.InventoryDragEvent;
-import org.bukkit.event.inventory.InventoryOpenEvent;
-import org.bukkit.event.player.PlayerChangedWorldEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.InventoryHolder;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-
-import com.bencodez.simpleapi.messages.MessageAPI;
-import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.util.BukkitCompletionScheduler;
-
-/** One isolated native inventory view; no registrations in existing production GUI managers. */
-public final class VoteStreaksMenu implements Listener, AutoCloseable {
-    public static final String PERMISSION = "VotingPlugin.Commands.Vote.Streaks";
-    private static final int MAX_SESSIONS = 128, MAX_LOADS = 16;
-    private final VotingPluginMain plugin;
-    private final Consumer<Runnable> worker;
-    private final BiFunction<UUID, String, VoteStreaksSnapshot> snapshot;
-    private final Map<UUID, Session> sessions = new ConcurrentHashMap<>();
-    private final AtomicInteger loading = new AtomicInteger();
-    private final AtomicInteger reloadDepth = new AtomicInteger();
-    private volatile boolean closed;
-
-    public VoteStreaksMenu(VotingPluginMain plugin) {
-        this(plugin, task -> plugin.getUserManager().getDataManager().getTimer().execute(task), (uuid, name) ->
-                plugin.getVoteStreakHandler().snapshotForDisplay(plugin.getVotingPluginUserManager().getVotingPluginUser(uuid, name)));
-    }
-    VoteStreaksMenu(VotingPluginMain plugin, Consumer<Runnable> worker, BiFunction<UUID, String, VoteStreaksSnapshot> snapshot) {
-        this.plugin = plugin; this.worker = worker; this.snapshot = snapshot;
-    }
-    private static final class Session {
-        final Player player;
-        final UUID owner;
-        final String name;
-        final Inventory previous;
-        final boolean ownsPrevious;
-        final long created = System.nanoTime();
-        volatile Holder view;
-        Session(Player player, VoteStreaksMenu manager) {
-            this.player = player; owner = player.getUniqueId(); name = player.getName();
-            previous = player.getOpenInventory().getTopInventory();
-            Holder holder = manager.holder(previous);
-            ownsPrevious = holder != null && holder.session.owner.equals(owner);
-        }
-    }
-    static final class Holder implements InventoryHolder {
-        final VoteStreaksMenu manager;
-        final Session session;
-        final VoteStreaksSnapshot snapshot;
-        final int page;
-        Inventory inventory;
-        Holder(VoteStreaksMenu manager, Session session, VoteStreaksSnapshot snapshot, int page) {
-            this.manager = manager; this.session = session; this.snapshot = snapshot; this.page = snapshot.clampPage(page);
-        }
-        @Override public Inventory getInventory() { return inventory; }
-    }
-    private static boolean permitted(Player player) {
-        return player.isOnline() && (player.hasPermission(PERMISSION) || player.hasPermission("VotingPlugin.Player"));
-    }
-    private void onPlayer(Player player, Runnable work, Runnable rejected) {
-        BukkitCompletionScheduler.run(plugin, player, work, rejected, rejected);
-    }
-    public void open(Player player) {
-        onPlayer(player, () -> begin(player), () -> { });
-    }
-    private void begin(Player player) {
-        if (closed || reloadDepth.get() != 0 || !permitted(player)) return;
-        if (loading.incrementAndGet() > MAX_LOADS) {
-            loading.decrementAndGet(); player.sendMessage("Vote streaks are busy. Please try again shortly."); return;
-        }
-        Session session;
-        synchronized (sessions) {
-            if (closed || reloadDepth.get() != 0 || (sessions.size() >= MAX_SESSIONS && !sessions.containsKey(player.getUniqueId()))) {
-                loading.decrementAndGet(); player.sendMessage("Vote streaks are unavailable. Please try again shortly."); return;
-            }
-            session = new Session(player, this); sessions.put(session.owner, session);
-        }
-        try {
-            worker.accept(() -> {
-                try {
-                    if (!current(session)) return;
-                    VoteStreaksSnapshot data = snapshot.apply(session.owner, session.name);
-                    onPlayer(player, () -> {
-                        if (!current(session)) return;
-                        if (!permitted(player) || System.nanoTime() - session.created > 30_000_000_000L
-                                || player.getOpenInventory().getTopInventory() != session.previous) {
-                            retire(session); return;
-                        }
-                        renderSafely(session, data, 0);
-                    }, () -> retire(session));
-                } catch (RuntimeException failure) {
-                    onPlayer(player, () -> {
-                        if (retire(session) && player.isOnline())
-                            player.sendMessage("Unable to read vote streaks. Please try again later.");
-                    }, () -> retire(session));
-                } finally { loading.decrementAndGet(); }
-            });
-        } catch (RuntimeException rejected) {
-            loading.decrementAndGet(); retire(session);
-            player.sendMessage("Vote streaks are unavailable. Please try again later.");
-        }
-    }
-    private boolean current(Session session) { return !closed && sessions.get(session.owner) == session; }
-    private Holder holder(Inventory inventory) {
-        return inventory != null && inventory.getHolder() instanceof Holder holder && holder.manager == this ? holder : null;
-    }
-    private void renderSafely(Session session, VoteStreaksSnapshot data, int page) {
-        try { render(session, data, page); }
-        catch (RuntimeException failure) {
-            if (sessions.remove(session.owner, session)) {
-                closeView(session);
-                if (session.player.isOnline()) session.player.sendMessage("Unable to open vote streaks. Please try again later.");
-            }
-        }
-    }
-    private void navigate(Holder holder, int page) {
-        onPlayer(holder.session.player, () -> {
-            if (current(holder.session) && holder.session.view == holder
-                    && holder.session.player.getOpenInventory().getTopInventory() == holder.inventory)
-                renderSafely(holder.session, holder.snapshot, page);
-        }, () -> sessions.remove(holder.session.owner, holder.session));
-    }
-    private void render(Session session, VoteStreaksSnapshot data, int page) {
-        if (!current(session) || !permitted(session.player)) return;
-        Holder holder = new Holder(this, session, data, page);
-        String title = plugin.getGui().getChestVoteStreaksName();
-        holder.inventory = Bukkit.createInventory(holder, 54, MessageAPI.colorize(title));
-        for (int i = 0; i < data.periods().size(); i++) {
-            var period = data.periods().get(i); String unit = VoteStreaksSnapshot.unit(period.type());
-            holder.inventory.setItem(11 + i * 2, item(Material.CLOCK, "&6" + period.type() + " streak",
-                    List.of("&7Current: &e" + period.current() + " " + unit, "&7Best: &e" + period.best() + " " + unit)));
-        }
-        List<VoteStreaksSnapshot.Milestone> milestones = data.page(holder.page);
-        for (int i = 0; i < milestones.size(); i++) {
-            var milestone = milestones.get(i); String unit = VoteStreaksSnapshot.unit(milestone.type());
-            var lore = new ArrayList<String>();
-            lore.add("&7Current: &e" + milestone.current() + " " + unit);
-            lore.add("&7Best: &e" + milestone.best() + " " + unit);
-            lore.add("&7Milestone: &e" + milestone.threshold() + " " + unit);
-            lore.add("&7Votes per period: &e" + milestone.votesRequired());
-            lore.add(milestone.recurring() ? "&7Repeats every " + milestone.threshold() + " " + unit + "; next: " + milestone.nextThreshold()
-                    : milestone.current() >= milestone.threshold() ? "&aCurrent streak meets this milestone" : "&7Upcoming milestone");
-            lore.add("&7Progress only; this does not claim rewards.");
-            holder.inventory.setItem(20 + i, item(Material.PAPER, "&e" + milestone.id(), lore));
-        }
-        if (milestones.isEmpty()) holder.inventory.setItem(22, item(Material.PAPER, "&7No enabled streak milestones",
-                List.of("&7Configure VoteStreaks in SpecialRewards.yml.")));
-        holder.inventory.setItem(45, item(Material.ARROW, "&ePrevious", List.of()));
-        holder.inventory.setItem(49, item(Material.BARRIER, "&cClose", List.of()));
-        holder.inventory.setItem(50, item(Material.CLOCK, "&eRefresh", List.of("&7Read current streaks again.")));
-        holder.inventory.setItem(53, item(Material.ARROW, "&eNext", List.of("&7Page " + (holder.page + 1) + "/" + data.pages(),
-                data.truncated() ? "&7Showing the first 512 enabled milestones." : "&7Read-only streak progression.")));
-        session.view = holder;
-        if (!current(session) || !permitted(session.player)) return;
-        session.player.openInventory(holder.inventory);
-        if (!current(session) && session.player.getOpenInventory().getTopInventory() == holder.inventory)
-            session.player.closeInventory();
-        if (session.player.getOpenInventory().getTopInventory() != holder.inventory) sessions.remove(session.owner, session);
-    }
-    private static ItemStack item(Material material, String name, List<String> lore) {
-        ItemStack item = new ItemStack(material); ItemMeta meta = item.getItemMeta();
-        if (meta != null) {
-            meta.setDisplayName(MessageAPI.colorize(name));
-            meta.setLore(lore.stream().map(MessageAPI::colorize).toList()); item.setItemMeta(meta);
-        }
-        return item;
-    }
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
-    public void inventoryOpen(InventoryOpenEvent event) {
-        if (!(event.getPlayer() instanceof Player player)) return;
-        Holder holder = holder(event.getInventory());
-        if (holder == null) return;
-        if (holder.session.player != player || !current(holder.session) || holder.session.view != holder || !permitted(player)) {
-            event.setCancelled(true); return;
-        }
-        if (event.isCancelled()) sessions.remove(holder.session.owner, holder.session);
-    }
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void unrelatedInventoryOpen(InventoryOpenEvent event) {
-        if (!event.isCancelled() && holder(event.getInventory()) == null && event.getPlayer() instanceof Player player)
-            sessions.remove(player.getUniqueId());
-    }
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
-    public void click(InventoryClickEvent event) {
-        Holder holder = holder(event.getView().getTopInventory());
-        if (holder == null) return;
-        boolean cancelled = event.isCancelled(); event.setCancelled(true);
-        if (cancelled || event.getWhoClicked() != holder.session.player || !current(holder.session)
-                || holder.session.view != holder || !permitted(holder.session.player)) return;
-        // Only ordinary top-inventory clicks navigate; shift/number/drop actions cannot move previews.
-        if (event.getRawSlot() < 0 || event.getRawSlot() >= 54 || !event.isLeftClick() || event.isShiftClick()) return;
-        switch (event.getRawSlot()) {
-        case 45 -> navigate(holder, holder.page - 1);
-        case 53 -> navigate(holder, holder.page + 1);
-        case 49 -> { sessions.remove(holder.session.owner, holder.session); closeView(holder.session); }
-        case 50 -> begin(holder.session.player);
-        default -> { }
-        }
-    }
-    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = false)
-    public void drag(InventoryDragEvent event) {
-        if (holder(event.getView().getTopInventory()) != null) event.setCancelled(true);
-    }
-    @EventHandler public void inventoryClose(InventoryCloseEvent event) {
-        Holder holder = holder(event.getInventory());
-        if (holder != null && holder.session.view == holder) sessions.remove(holder.session.owner, holder.session);
-        else if (event.getPlayer() instanceof Player player) {
-            Session pending = sessions.get(player.getUniqueId());
-            if (pending != null && pending.view == null && pending.previous == event.getInventory()) sessions.remove(pending.owner, pending);
-        }
-    }
-    @EventHandler public void quit(PlayerQuitEvent event) { sessions.remove(event.getPlayer().getUniqueId()); }
-    @EventHandler public void worldChange(PlayerChangedWorldEvent event) { end(event.getPlayer()); }
-    @EventHandler public void death(PlayerDeathEvent event) { end(event.getEntity()); }
-    private void end(Player player) { Session session = sessions.remove(player.getUniqueId()); if (session != null) closeView(session); }
-    private boolean retire(Session session) {
-        if (!sessions.remove(session.owner, session)) return false;
-        closeView(session); return true;
-    }
-    private void closeView(Session session) {
-        if (session.view == null && !session.ownsPrevious) return;
-        Runnable cleanup = () -> {
-            // A queued cleanup must never close an inventory adopted by a newer request.
-            Session replacement = sessions.get(session.owner);
-            if (replacement != null && replacement != session) return;
-            Inventory top = session.player.getOpenInventory().getTopInventory();
-            if ((session.view != null && top == session.view.inventory)
-                    || (session.ownsPrevious && top == session.previous)) session.player.closeInventory();
-        };
-        // Bukkit rejects scheduling after disable. Its primary thread already owns this interaction.
-        if (closed && ownsForShutdown(Bukkit.class, session.player)) cleanup.run();
-        else onPlayer(session.player, cleanup, () -> { });
-    }
-    /** Public Folia ownership also recognizes its stopped-region shutdown owner. */
-    static boolean ownsForShutdown(Class<?> platform, Player player) {
-        try {
-            return Boolean.TRUE.equals(platform.getMethod("isOwnedByCurrentRegion", org.bukkit.entity.Entity.class).invoke(null, player));
-        } catch (NoSuchMethodException legacy) {
-            try {
-                Class.forName("io.papermc.paper.threadedregions.RegionizedServer", false, VoteStreaksMenu.class.getClassLoader());
-                return false; // A regional server without its ownership API must fail closed.
-            } catch (ClassNotFoundException ordinaryServer) { return Bukkit.isPrimaryThread(); }
-            catch (LinkageError unavailable) { return false; }
-        } catch (ReflectiveOperationException | LinkageError unavailable) { return false; }
-    }
-    public void suspend() { reloadDepth.incrementAndGet(); reset(); }
-    public void resume() { reloadDepth.updateAndGet(value -> Math.max(0, value - 1)); }
-    public void reset() {
-        List<Session> old;
-        synchronized (sessions) { old = List.copyOf(sessions.values()); sessions.clear(); }
-        old.forEach(this::closeView);
-    }
-    @Override public void close() { synchronized (sessions) { closed = true; } reset(); }
-    int sessionCount() { return sessions.size(); }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/streaks/VoteStreaksSnapshot.java

@@ -1,37 +0,0 @@
-package com.bencodez.votingplugin.streaks;
-
-import java.util.List;
-import com.bencodez.votingplugin.specialrewards.votestreak.VoteStreakType;
-
-/** Read-only observations of existing state; never evidence that a reward was delivered. */
-public record VoteStreaksSnapshot(List<Period> periods, List<Milestone> milestones, boolean truncated) {
-    public static final int MAX_MILESTONES = 512;
-    public static final int PAGE_SIZE = 5;
-    public VoteStreaksSnapshot {
-        periods = List.copyOf(periods);
-        milestones = List.copyOf(milestones);
-        if (periods.size() != 3 || milestones.size() > MAX_MILESTONES) throw new IllegalArgumentException("Invalid streak snapshot size");
-    }
-    public record Period(VoteStreakType type, int current, int best) {
-        public Period { current = Math.max(0, current); best = Math.max(current, best); }
-    }
-    public record Milestone(String id, VoteStreakType type, int current, int best,
-            int threshold, int votesRequired, boolean recurring) {
-        public Milestone {
-            current = Math.max(0, current); best = Math.max(current, best);
-            threshold = Math.max(1, threshold); votesRequired = Math.max(1, votesRequired);
-        }
-        public long nextThreshold() {
-            return recurring ? ((long) current / threshold + 1L) * threshold : threshold;
-        }
-    }
-    public int pages() { return Math.max(1, (milestones.size() + PAGE_SIZE - 1) / PAGE_SIZE); }
-    public int clampPage(int page) { return Math.max(0, Math.min(page, pages() - 1)); }
-    public List<Milestone> page(int page) {
-        int start = clampPage(page) * PAGE_SIZE;
-        return milestones.subList(start, Math.min(start + PAGE_SIZE, milestones.size()));
-    }
-    public static String unit(VoteStreakType type) {
-        return switch (type) { case DAILY -> "days"; case WEEKLY -> "weeks"; case MONTHLY -> "months"; };
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/timequeue/TimeQueueHandler.java

@@ -3,15 +3,10 @@ package com.bencodez.votingplugin.timequeue;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.Queue;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.FutureTask;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
 
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.event.EventHandler;
@@ -29,24 +24,11 @@ import lombok.Getter;
  * The TimeQueueHandler class manages time-based vote queue processing.
  */
 public class TimeQueueHandler implements Listener {
+	private static final long TICKS_PER_SECOND = 20L;
 	@Getter
 	private Queue<VoteTimeQueue> timeChangeQueue = new ConcurrentLinkedQueue<>();
 
 	private VotingPluginMain plugin;
-	private final Object persistenceLock = new Object();
-	private volatile boolean stopping;
-	private final AtomicReference<FutureTask<Void>> shutdownSave = new AtomicReference<>();
-	// A failed task is retryable, but cannot release its unsaved suffix to a successor.
-	private final AtomicReference<ShutdownPublication> shutdownPublicationOwner = new AtomicReference<>();
-	private record ShutdownPublication(com.bencodez.votingplugin.util.ServerDataPublicationFence.Lease lease,
-			java.util.concurrent.ScheduledExecutorService producers,
-			java.util.concurrent.ScheduledExecutorService[] coreWriters) { }
-	private final AtomicBoolean processing = new AtomicBoolean();
-	private VoteTimeQueue dispatchingVote;
-	private UUID dispatchId;
-	private boolean dispatchEnded;
-	private boolean dispatchStarted;
-	private int persistedShutdownVotes;
 	private final AtomicBoolean retryPending = new AtomicBoolean();
 	private final AtomicInteger retryAttempts = new AtomicInteger();
 
@@ -66,23 +48,10 @@ public class TimeQueueHandler implements Listener {
 	 * @param voteUsername the voter username
 	 * @param voteSiteName the vote site name
 	 */
-	public void addVote(String voteUsername, String voteSiteName) { addVote(voteUsername, voteSiteName, 0L); }
-
-    public void addVote(String voteUsername, String voteSiteName, long occurredAt) {
-        addVote(voteUsername, voteSiteName, occurredAt, UUID.randomUUID());
-    }
-
-    public void addVote(String voteUsername, String voteSiteName, long occurredAt, UUID localOccurrenceId) {
-        java.util.Objects.requireNonNull(localOccurrenceId, "localOccurrenceId");
-        VoteTimeQueue queued = new VoteTimeQueue(voteUsername, voteSiteName,
-                LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli());
-        queued.setLocalOccurrenceId(localOccurrenceId);
-        if (occurredAt > 0) queued.setCanonicalOccurrenceTime(occurredAt);
-        synchronized (persistenceLock) {
-            timeChangeQueue.add(queued);
-            if (stopping) persistPendingVotes();
-        }
-    }
+	public void addVote(String voteUsername, String voteSiteName) {
+		timeChangeQueue.add(new VoteTimeQueue(voteUsername, voteSiteName,
+				LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()));
+	}
 
 	/**
 	 * Loads cached votes from server data and schedules queue processing.
@@ -90,29 +59,8 @@ public class TimeQueueHandler implements Listener {
 	public void load() {
 		for (String str : plugin.getServerData().getTimedVoteCacheKeys()) {
 			ConfigurationSection data = plugin.getServerData().getTimedVoteCacheSection(str);
-            VoteTimeQueue queued = new VoteTimeQueue(data.getString("Name"), data.getString("Service"), data.getLong("Time"));
-            UUID localOccurrenceId;
-            if (!data.contains("LocalOccurrenceId")) {
-                // The existing ServerData saver can defer publication. Derive only
-                // legacy migration IDs from their persisted row identity so a crash
-                // before that save completes cannot reroll the same legacy row.
-                String identity = "legacy-local-timed-vote\u0000" + str + "\u0000" + queued.getName()
-                        + "\u0000" + queued.getService() + "\u0000" + queued.getTime();
-                localOccurrenceId = UUID.nameUUIDFromBytes(identity.getBytes(java.nio.charset.StandardCharsets.UTF_8));
-                plugin.getServerData().setTimedVoteLocalOccurrenceId(str, localOccurrenceId);
-            } else {
-                String rawId = data.getString("LocalOccurrenceId");
-                try {
-                    localOccurrenceId = UUID.fromString(rawId);
-                    if (!localOccurrenceId.toString().equalsIgnoreCase(rawId)) throw new IllegalArgumentException();
-                } catch (IllegalArgumentException | NullPointerException malformed) {
-                    plugin.getLogger().warning("Invalid local occurrence ID in timed vote cache; row withheld");
-                    continue;
-                }
-            }
-            queued.setLocalOccurrenceId(localOccurrenceId);
-            if (data.contains("CanonicalOccurrenceTime")) queued.setCanonicalOccurrenceTime(data.getLong("CanonicalOccurrenceTime", -1L));
-            timeChangeQueue.add(queued);
+			timeChangeQueue
+					.add(new VoteTimeQueue(data.getString("Name"), data.getString("Service"), data.getLong("Time")));
 		}
 		scheduleQueueProcessing(120, TimeUnit.SECONDS);
 	}
@@ -128,11 +76,17 @@ public class TimeQueueHandler implements Listener {
 	}
 
 	private void scheduleQueueProcessing(long delay, TimeUnit unit) {
-		synchronized (persistenceLock) { if (stopping) return; }
-		boolean admitted = VoteTaskAdmission.trySchedule(plugin.getVoteTimer(), this::processQueue, delay, unit);
+		boolean admitted = VoteTaskAdmission.trySchedule(plugin.getVoteTimer(), () -> {
+			// Clear only after the bounded executor has admitted the task. If it is
+			// rejected, shutdown persistence can still recover the in-memory queue.
+			plugin.getServerData().clearTimedVoteCache();
+			processQueue();
+		}, delay, unit);
 		if (!admitted) {
 			plugin.getLogger().warning("Unable to schedule time-queue processing because vote processing is busy; queued votes were retained.");
 			scheduleRetry();
+		} else {
+			retryAttempts.set(0);
 		}
 	}
 
@@ -140,14 +94,15 @@ public class TimeQueueHandler implements Listener {
 		if (timeChangeQueue.isEmpty() || !retryPending.compareAndSet(false, true)) return;
 		int attempt = Math.min(6, retryAttempts.getAndIncrement());
 		long delaySeconds = Math.min(60L, 1L << attempt);
+		long delayTicks = delaySeconds * TICKS_PER_SECOND;
 		try {
 			plugin.getBukkitScheduler().runTaskLaterAsynchronously(plugin, () -> {
 				retryPending.set(false);
 				if (!timeChangeQueue.isEmpty()) scheduleQueueProcessing(0, TimeUnit.SECONDS);
-			}, delaySeconds);
+			}, delayTicks);
 		} catch (RuntimeException rejected) {
 			retryPending.set(false);
-			plugin.getLogger().warning("Unable to queue a time-queue retry; pending votes remain owned for recovery.");
+			plugin.getLogger().warning("Unable to queue a time-queue retry; pending votes remain persisted for recovery.");
 		}
 	}
 
@@ -155,241 +110,32 @@ public class TimeQueueHandler implements Listener {
 	 * Processes all votes in the queue.
 	 */
 	public void processQueue() {
-		if (!processing.compareAndSet(false, true)) return;
-		boolean retry = false;
-		try {
-			synchronized (persistenceLock) {
-				if (stopping) return;
-				if (dispatchingVote != null) {
-					if (!dispatchEnded) return;
-					retainUncertainDispatch();
-					clearDispatch();
-				}
-				persistedShutdownVotes = 0;
+		while (getTimeChangeQueue().size() > 0) {
+			VoteTimeQueue vote = getTimeChangeQueue().remove();
+			PlayerVoteEvent voteEvent = new PlayerVoteEvent(
+					plugin.getVoteSiteManager().getVoteSite(plugin.getVoteSiteManager().getVoteSiteName(true, vote.getService()), true), vote.getName(),
+					vote.getService(), true);
+			voteEvent.setTime(vote.getTime());
+			plugin.getServer().getPluginManager().callEvent(voteEvent);
+
+			if (voteEvent.isCancelled()) {
+				plugin.debug("Vote cancelled");
+				continue;
 			}
-			while (true) {
-				VoteTimeQueue vote;
-				synchronized (persistenceLock) {
-					if (stopping || dispatchingVote != null) return;
-					vote = timeChangeQueue.peek();
-				}
-				if (vote == null) return;
-				PlayerVoteEvent voteEvent = new PlayerVoteEvent(
-						plugin.getVoteSiteManager().getVoteSite(plugin.getVoteSiteManager().getVoteSiteName(true, vote.getService()), true), vote.getName(),
-						vote.getService(), true);
-				voteEvent.setTime(vote.getTime());
-				voteEvent.setLocalOccurrenceId(vote.getLocalOccurrenceId());
-				if (vote.getCanonicalOccurrenceTime() != 0L) voteEvent.setCanonicalOccurrenceTime(vote.getCanonicalOccurrenceTime());
-				synchronized (persistenceLock) {
-					if (stopping) return;
-					if (timeChangeQueue.peek() != vote) continue;
-					dispatchingVote = vote;
-					if (vote.getVoteId() == null) vote.setVoteId(UUID.randomUUID());
-					dispatchId = vote.getVoteId();
-					dispatchEnded = false;
-					try {
-						plugin.getServerData().prepareTimedVoteDispatch(dispatchId, vote,
-								timeChangeQueue.stream().filter(pending -> pending != vote).toList());
-					} catch (RuntimeException | Error failure) {
-						clearDispatch();
-						throw failure;
-					}
-					// A preparation resumed after stop is still eligible for normal recovery.
-					if (stopping) return;
-					dispatchStarted = true;
-				}
-				try {
-					plugin.getServer().getPluginManager().callEvent(voteEvent);
-				} catch (RuntimeException | Error failure) {
-					synchronized (persistenceLock) {
-						dispatchEnded = true;
-						try {
-							retainUncertainDispatch();
-							clearDispatch();
-							if (!stopping) checkpointPendingVotes();
-						} catch (RuntimeException | Error persistenceFailure) {
-							if (failure != persistenceFailure) failure.addSuppressed(persistenceFailure);
-						}
-					}
-					throw failure;
-				}
-				synchronized (persistenceLock) {
-					dispatchEnded = true;
-					if (!stopping) plugin.getServerData().completeTimedVoteDispatch(dispatchId);
-					timeChangeQueue.remove(vote);
-					clearDispatch();
-					if (voteEvent.isCancelled() && !stopping) checkpointPendingVotes();
-				}
-				if (voteEvent.isCancelled()) {
-					plugin.debug("Vote cancelled");
-					continue;
-				}
-			}
-		} catch (RuntimeException | Error failure) {
-			retry = !stopping;
-			throw failure;
-		} finally {
-			processing.set(false);
-			if (retry) scheduleRetry();
-			else retryAttempts.set(0);
 		}
 	}
 
-	private void clearDispatch() {
-		dispatchingVote = null;
-		dispatchId = null;
-		dispatchEnded = false;
-		dispatchStarted = false;
-	}
-
-	private void checkpointPendingVotes() {
-		plugin.getServerData().replaceTimedVoteCache(
-				timeChangeQueue.stream().filter(vote -> vote != dispatchingVote).toList());
-		persistedShutdownVotes = 0;
-	}
-
-	/** Uncertain event delivery is retained for review, never automatically replayed. */
-	private void retainUncertainDispatch() {
-		if (dispatchingVote == null || !timeChangeQueue.contains(dispatchingVote)) return;
-		plugin.getServerData().addUncertainTimedVote(dispatchId, dispatchingVote);
-		timeChangeQueue.remove(dispatchingVote);
-		plugin.getLogger().warning("Timed vote event delivery is uncertain; retained in ServerData.yml VotingPlugin.UncertainTimedVotes for manual review.");
-	}
-
 	/**
 	 * Saves pending votes to server data.
 	 */
 	public void save() {
-		if (stopping) {
-			saveForShutdown();
-			return;
-		}
-		synchronized (persistenceLock) {
-			if (stopping) persistPendingVotes();
-			else checkpointPendingVotes();
-		}
-	}
-
-	/** Seal processing and retain one persistence owner without an unbounded lifecycle wait. */
-	public void saveForShutdown() {
-		stopping = true;
-		FutureTask<Void> save;
-		while (true) {
-			save = shutdownSave.get();
-			if (save != null) {
-				if (!save.isDone()) break;
-				shutdownSave.compareAndSet(save, null);
-				continue;
-			}
-			FutureTask<Void> candidate = new FutureTask<Void>(() -> {
-				try {
-					var publication = java.util.Objects.requireNonNull(shutdownPublicationOwner.get());
-					try { synchronized (persistenceLock) { persistPendingVotes(); } }
-					finally {
-						// Publication failure does not terminate previously admitted producers.
-						awaitRetiringProducers(publication.producers());
-						if (publication.coreWriters() != null)
-							for (var writer : publication.coreWriters()) awaitWriterTermination(writer);
-					}
-					synchronized (persistenceLock) { persistPendingVotes(); }
-					if (publication.lease() != null) publication.lease().close();
-					shutdownPublicationOwner.compareAndSet(publication, null);
-				} catch (RuntimeException | Error failure) {
-					try {
-						plugin.getLogger().warning("Timed vote shutdown persistence failed; pending votes remain owned for retry. Recovery is not confirmed.");
-					} catch (RuntimeException | Error ignored) { }
-					throw failure;
-				}
-				return null;
-			}) {
-				@Override protected void done() {
-					// Late admission failures must be retryable after this owner completes.
-					shutdownSave.compareAndSet(this, null);
-				}
-			};
-			FutureTask<Void> existing = shutdownSave.compareAndExchange(null, candidate);
-			if (existing == null) {
-				save = candidate;
-				try {
-					if (shutdownPublicationOwner.get() == null) {
-						// Unload can clear these fields even while their original work survives.
-						// Keep the snapshot with its lease through every rejected or failed attempt.
-						var producers = plugin.getVoteTimer();
-						var coreWriters = plugin.getServerDataWriterExecutors();
-						var retainedWriters = coreWriters == null ? null : coreWriters.clone();
-						var fence = plugin.getServerDataPublicationFence();
-						shutdownPublicationOwner.set(new ShutdownPublication(
-								fence == null ? null : fence.acquire(), producers, retainedWriters));
-					}
-					startShutdownWorker(candidate);
-				}
-				catch (RuntimeException | Error failure) {
-					// Even a rejected worker retains the queue owner for an explicit retry.
-					candidate.cancel(false);
-					shutdownSave.compareAndSet(candidate, null);
-					throw failure;
-				}
-				break;
-			}
-		}
-		try {
-			save.get(1, TimeUnit.SECONDS);
-			shutdownSave.compareAndSet(save, null);
-		} catch (TimeoutException pending) {
-			plugin.getLogger().warning("Timed vote shutdown persistence is still pending; its worker retains ownership. Recovery is not yet confirmed.");
-		} catch (InterruptedException interrupted) {
-			Thread.currentThread().interrupt();
-			plugin.getLogger().warning("Timed vote shutdown persistence wait was interrupted; its worker retains ownership.");
-		} catch (ExecutionException failure) {
-			shutdownSave.compareAndSet(save, null);
-			Throwable cause = failure.getCause();
-			if (cause instanceof Error error) throw error;
-			if (cause instanceof RuntimeException runtime) throw runtime;
-			throw new IllegalStateException("Timed vote shutdown persistence failed", cause);
-		}
-	}
-
-	/** Kept separate so worker-admission failure can be exercised without replacing persistence. */
-	protected void startShutdownWorker(Runnable task) {
-		Thread worker = new Thread(task, "VotingPlugin-timed-vote-shutdown");
-		worker.setDaemon(true);
-		worker.start();
-	}
-
-	private void awaitRetiringProducers(java.util.concurrent.ScheduledExecutorService producers) {
-		if (producers == null || !producers.isShutdown()) return;
-		awaitWriterTermination(producers);
-	}
-
-	private void awaitWriterTermination(java.util.concurrent.ScheduledExecutorService producers) {
-		if (producers == null) return;
-		boolean interrupted = false;
-		try {
-			while (!producers.isTerminated()) {
-				try { producers.awaitTermination(100, TimeUnit.MILLISECONDS); }
-				catch (InterruptedException ignored) { interrupted = true; }
-			}
-		} finally { if (interrupted) Thread.currentThread().interrupt(); }
-	}
-
-	/** Remove only a successfully saved prefix; failures retain the same next slot for retry. */
-	private void persistPendingVotes() {
-		VoteTimeQueue vote;
-		while ((vote = timeChangeQueue.peek()) != null) {
-			if (vote == dispatchingVote) {
-				if (dispatchStarted) retainUncertainDispatch();
-				else {
-					var pending = timeChangeQueue.stream().toList();
-					plugin.getServerData().abortTimedVoteDispatch(dispatchId, pending);
-					timeChangeQueue.removeAll(pending);
-					persistedShutdownVotes = pending.size();
-					clearDispatch();
-				}
-			} else {
-				plugin.getServerData().addTimeVoted(persistedShutdownVotes, vote);
-				persistedShutdownVotes++;
-				timeChangeQueue.remove(vote);
+		if (!timeChangeQueue.isEmpty()) {
+			int num = 0;
+			for (VoteTimeQueue vote : timeChangeQueue) {
+				plugin.getServerData().addTimeVoted(num, vote);
+				num++;
 			}
 		}
+		timeChangeQueue.clear();
 	}
 }

VotingPlugin/src/main/java/com/bencodez/votingplugin/timequeue/VoteTimeQueue.java

@@ -30,10 +30,6 @@ public class VoteTimeQueue {
 	@Getter
 	@Setter
 	private UUID voteId;
-	/** Local Bukkit receipt identity; never used as a proxy transport vote ID. */
-	@Getter
-	@Setter
-	private UUID localOccurrenceId;
 	/** SQL primary key for a legacy timed-cache row, or {@code -1} when not SQL-backed. */
 	@Getter
 	@Setter
@@ -51,19 +47,6 @@ public class VoteTimeQueue {
 	@Getter
 	@Setter
 	private String totals;
-
-	public long getCanonicalOccurrenceTime() {
-		Long original = com.bencodez.votingplugin.proxy.VoteOccurrenceMetadata.read(totals);
-		return original == null ? 0L : original;
-	}
-
-	public void setCanonicalOccurrenceTime(long time) {
-		totals = com.bencodez.votingplugin.proxy.VoteOccurrenceMetadata.store(totals, time);
-	}
-
-	public void setTotals(String updated) {
-		totals = com.bencodez.votingplugin.proxy.VoteOccurrenceMetadata.preserve(totals, updated);
-	}
 	@Getter
 	@Setter
 	private boolean processed;

VotingPlugin/src/main/java/com/bencodez/votingplugin/topvoter/TopVoterDisplayFilter.java

@@ -1,269 +0,0 @@
-package com.bencodez.votingplugin.topvoter;
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Set;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Function;
-import java.util.function.BiFunction;
-import java.util.function.LongSupplier;
-import com.bencodez.advancedcore.api.user.presence.PlayerPresence;
-import org.bukkit.event.Listener;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.player.PlayerJoinEvent;
-
-/** Bounded display snapshots only; raw rankings and award inputs stay untouched. */
-public final class TopVoterDisplayFilter implements AutoCloseable, Listener {
-    private static final int MAX_PENDING = 128;
-    private static final int MAX_CACHED = 8192;
-    private static final long MAX_AGE = java.util.concurrent.TimeUnit.SECONDS.toNanos(30);
-    private record Identity(UUID uuid, String name) { }
-    private static final class Evidence {
-        private PlayerPresence value = PlayerPresence.UNKNOWN;
-        private long completed;
-        private boolean pending = true;
-        private Set<UUID> identities = Set.of();
-        private long joinGeneration;
-        private TopVoterPlayer snapshot;
-        private List<UUID> aliases;
-        private final CompletableFuture<Void> settled = new CompletableFuture<>();
-    }
-    private final Function<TopVoterPlayer, List<UUID>> identities;
-    private final BiFunction<TopVoterPlayer, List<UUID>, CompletionStage<PlayerPresence>> lookup;
-    private final LongSupplier clock;
-    private final LongSupplier rankingRowBudget;
-    private volatile int cacheLimit = MAX_CACHED;
-    private final LinkedHashMap<Identity, Evidence> cache = new LinkedHashMap<>(16, 0.75f, true);
-    private int pending;
-    private boolean closed;
-    private long joinGeneration;
-
-    public TopVoterDisplayFilter(Function<TopVoterPlayer, CompletionStage<PlayerPresence>> lookup) {
-        this(lookup, System::nanoTime);
-    }
-
-    public TopVoterDisplayFilter(Function<TopVoterPlayer, CompletionStage<PlayerPresence>> lookup, LongSupplier clock) {
-        this(player -> List.of(player.getUuid()), (player, aliases) -> lookup.apply(player), clock);
-        Objects.requireNonNull(lookup);
-    }
-
-    /** Check the captured cache-only scope asynchronously; revalidate it before using negative evidence. */
-    public TopVoterDisplayFilter(Function<TopVoterPlayer, List<UUID>> identities,
-            BiFunction<TopVoterPlayer, List<UUID>, CompletionStage<PlayerPresence>> lookup) {
-        this(identities, lookup, System::nanoTime);
-    }
-
-    public TopVoterDisplayFilter(Function<TopVoterPlayer, List<UUID>> identities,
-            BiFunction<TopVoterPlayer, List<UUID>, CompletionStage<PlayerPresence>> lookup, LongSupplier clock) {
-        this(identities, lookup, clock, () -> 0L);
-    }
-
-    /** The owner supplies the row count already retained in current and historical ranking maps. */
-    public TopVoterDisplayFilter(Function<TopVoterPlayer, List<UUID>> identities,
-            BiFunction<TopVoterPlayer, List<UUID>, CompletionStage<PlayerPresence>> lookup, LongSupplier clock,
-            LongSupplier rankingRowBudget) {
-        this.identities = Objects.requireNonNull(identities);
-        this.lookup = Objects.requireNonNull(lookup);
-        this.clock = Objects.requireNonNull(clock);
-        this.rankingRowBudget = Objects.requireNonNull(rankingRowBudget);
-    }
-
-    /** Pending, failed, missing or stale evidence remains visible until a checked result arrives. */
-    public LinkedHashMap<TopVoterPlayer, Integer> project(Map<TopVoterPlayer, Integer> rankings, boolean enabled) {
-        if (enabled) reserveRankingRows(rankings.size());
-        var visible = new LinkedHashMap<TopVoterPlayer, Integer>();
-        for (var entry : rankings.entrySet()) {
-            if (!enabled || evidence(entry.getKey()) != PlayerPresence.NEVER_JOINED)
-                visible.put(entry.getKey(), entry.getValue());
-        }
-        return visible;
-    }
-
-    private void reserveRankingRows(int rows) {
-        long requested = rows;
-        // Read owner state outside the evidence monitor. A racing replacement may leave
-        // a temporary unknown budget; keep the previous bound until the next refresh.
-        try { requested = Math.max(requested, rankingRowBudget.getAsLong()); }
-        catch (RuntimeException unavailable) { requested = Math.max(requested, cacheLimit); }
-        synchronized (cache) {
-            cacheLimit = (int) Math.min(Integer.MAX_VALUE, Math.max(MAX_CACHED, requested));
-            trimCompletedEvidence(cacheLimit);
-        }
-    }
-
-    /** Called under cache; in-flight requests retain their bounded admission until completion. */
-    private void trimCompletedEvidence(int limit) {
-        var oldest = cache.entrySet().iterator();
-        while (cache.size() > limit && oldest.hasNext()) {
-            if (!oldest.next().getValue().pending) oldest.remove();
-        }
-    }
-
-    /** Await admitted checks without blocking their worker; unavailable rows stay visible. */
-    public CompletionStage<LinkedHashMap<TopVoterPlayer, Integer>> projectAsync(
-            Map<TopVoterPlayer, Integer> rankings, boolean enabled) {
-        var snapshot = new LinkedHashMap<>(rankings);
-        if (!enabled) return CompletableFuture.completedFuture(snapshot);
-        project(snapshot, true);
-        var captured = new LinkedHashMap<Identity, Evidence>();
-        var waiting = new java.util.ArrayList<CompletableFuture<Void>>();
-        synchronized (cache) {
-            for (TopVoterPlayer player : snapshot.keySet()) {
-                if (player == null || player.getUuid() == null) continue;
-                Identity key = new Identity(player.getUuid(), player.getPlayerName());
-                Evidence record = cache.get(key);
-                if (record != null) {
-                    captured.put(key, record);
-                    if (record.pending) waiting.add(record.settled);
-                }
-            }
-        }
-        return CompletableFuture.allOf(waiting.toArray(CompletableFuture[]::new))
-                .completeOnTimeout(null, 5, java.util.concurrent.TimeUnit.SECONDS).thenApply(ignored -> {
-                    var visible = new LinkedHashMap<TopVoterPlayer, Integer>();
-                    for (var entry : snapshot.entrySet()) {
-                        TopVoterPlayer player = entry.getKey();
-                        Identity key = player == null ? null : new Identity(player.getUuid(), player.getPlayerName());
-                        Evidence record = captured.get(key);
-                        if (record == null || cachedValue(key, record) != PlayerPresence.NEVER_JOINED)
-                            visible.put(player, entry.getValue());
-                    }
-                    return visible;
-                });
-    }
-
-    private PlayerPresence evidence(TopVoterPlayer player) {
-        if (player == null || player.getUuid() == null) return PlayerPresence.UNKNOWN;
-        Identity key = new Identity(player.getUuid(), player.getPlayerName());
-        Evidence record;
-        boolean reuse;
-        synchronized (cache) {
-            if (closed) return PlayerPresence.UNKNOWN;
-            record = cache.get(key);
-            reuse = record != null && (record.pending || clock.getAsLong() - record.completed < MAX_AGE);
-            if (!reuse) {
-                if (pending >= MAX_PENDING) return PlayerPresence.UNKNOWN;
-                if (record != null) cache.remove(key);
-                if (cache.size() >= cacheLimit) trimCompletedEvidence(cacheLimit - 1);
-                if (cache.size() >= cacheLimit) return PlayerPresence.UNKNOWN;
-                record = new Evidence(); cache.put(key, record); pending++;
-                record.joinGeneration = joinGeneration;
-                record.snapshot = new TopVoterPlayer(key.uuid(), key.name(), player.getLastVoteTime());
-            }
-        }
-        if (reuse) return cachedValue(key, record);
-        Evidence admitted = record;
-        try {
-            List<UUID> aliases = resolveScope(admitted.snapshot);
-            if (aliases == null) {
-                finish(key, admitted, PlayerPresence.UNKNOWN);
-                return PlayerPresence.UNKNOWN;
-            }
-            var checked = new java.util.HashSet<UUID>();
-            for (UUID alias : aliases) if (alias != null) checked.add(alias);
-            boolean valid;
-            synchronized (cache) {
-                valid = !closed && cache.get(key) == admitted && admitted.joinGeneration == joinGeneration;
-                if (valid) {
-                    admitted.identities = Set.copyOf(checked);
-                    admitted.aliases = aliases;
-                } else cache.remove(key, admitted);
-            }
-            if (!valid) {
-                finish(key, admitted, PlayerPresence.UNKNOWN);
-                return PlayerPresence.UNKNOWN;
-            }
-            CompletionStage<PlayerPresence> request = lookup.apply(admitted.snapshot, aliases);
-            if (request == null) finish(key, admitted, PlayerPresence.UNKNOWN);
-            else request.whenComplete((result, failure) -> finish(key, admitted,
-                    failure == null && result != null ? result : PlayerPresence.UNKNOWN));
-        } catch (RuntimeException unavailable) {
-            finish(key, admitted, PlayerPresence.UNKNOWN);
-        }
-        return cachedValue(key, admitted);
-    }
-
-    private List<UUID> resolveScope(TopVoterPlayer snapshot) {
-        List<UUID> resolved = identities.apply(snapshot);
-        if (resolved == null || resolved.isEmpty() || resolved.size() > 8) return null;
-        // Preserve null uncertainty markers and detach the provider from mutable cache data.
-        return java.util.Collections.unmodifiableList(new java.util.ArrayList<>(resolved));
-    }
-
-    private boolean matchesScope(Evidence record) {
-        try {
-            return record.aliases != null && record.aliases.equals(resolveScope(record.snapshot));
-        } catch (RuntimeException unavailable) {
-            return false;
-        }
-    }
-
-    private PlayerPresence cachedValue(Identity key, Evidence record) {
-        PlayerPresence value;
-        synchronized (cache) {
-            if (closed || cache.get(key) != record || record.pending
-                    || clock.getAsLong() - record.completed >= MAX_AGE) return PlayerPresence.UNKNOWN;
-            value = record.value;
-        }
-        // The resolver is cache-only, but must never run under the evidence-cache monitor.
-        if (value == PlayerPresence.NEVER_JOINED && !matchesScope(record)) {
-            synchronized (cache) { cache.remove(key, record); }
-            return PlayerPresence.UNKNOWN;
-        }
-        synchronized (cache) {
-            return !closed && cache.get(key) == record && !record.pending
-                    && clock.getAsLong() - record.completed < MAX_AGE ? record.value : PlayerPresence.UNKNOWN;
-        }
-    }
-
-    private void finish(Identity key, Evidence record, PlayerPresence result) {
-        boolean currentScope = result != PlayerPresence.NEVER_JOINED || matchesScope(record);
-        synchronized (cache) {
-            if (!record.pending) return;
-            record.pending = false; pending--;
-            if (!closed && cache.get(key) == record) {
-                if (!currentScope) cache.remove(key, record);
-                else { record.value = result; record.completed = clock.getAsLong(); }
-            }
-            trimCompletedEvidence(cacheLimit);
-        }
-        // Completion may invoke projection callbacks, which resolve aliases outside this monitor.
-        record.settled.complete(null);
-    }
-
-    /** A newly observed join revokes matching negative snapshots and pending stale completions. */
-    public void joined(UUID uuid, String name) {
-        var invalidated = new java.util.ArrayList<Evidence>();
-        synchronized (cache) {
-            joinGeneration++;
-            cache.entrySet().removeIf(entry -> {
-                boolean matches = Objects.equals(entry.getKey().uuid(), uuid)
-                        || (uuid != null && entry.getValue().identities.contains(uuid))
-                        || (name != null && name.equalsIgnoreCase(entry.getKey().name()));
-                if (matches) invalidated.add(entry.getValue());
-                return matches;
-            });
-        }
-        for (Evidence record : invalidated) record.settled.complete(null);
-    }
-
-    @EventHandler(priority = EventPriority.LOWEST)
-    public void onJoin(PlayerJoinEvent event) {
-        joined(event.getPlayer().getUniqueId(), event.getPlayer().getName());
-    }
-
-    @Override public void close() {
-        List<Evidence> retiring;
-        synchronized (cache) {
-            closed = true;
-            retiring = new java.util.ArrayList<>(cache.values());
-            cache.clear();
-        }
-        for (Evidence record : retiring) record.settled.complete(null);
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/topvoter/TopVoterHandler.java

@@ -113,12 +113,11 @@ public class TopVoterHandler implements Listener {
 	 */
 	public String[] getTopVotersWeekly() {
 		ArrayList<String> msg = new ArrayList<>();
-		var board = plugin.getTopVoterDisplay(TopVoter.Weekly);
-		ArrayList<TopVoterPlayer> users = new ArrayList<>(board.keySet());
+		ArrayList<TopVoterPlayer> users = new ArrayList<>(plugin.getTopVoter(TopVoter.Weekly).keySet());
 		for (int i = 0; i < users.size(); i++) {
 			String line = plugin.getConfigFile().getFormatCommandsVoteTopLine().replace("%num%", "" + (i + 1))
 					.replace("%player%", users.get(i).getPlayerName())
-					.replace("%votes%", "" + board.get(users.get(i)));
+					.replace("%votes%", "" + plugin.getTopVoter(TopVoter.Weekly).get(users.get(i)));
 			msg.add(line);
 		}
 		msg = ArrayUtils.colorize(msg);
@@ -639,12 +638,11 @@ public class TopVoterHandler implements Listener {
 	 * @return the string[]
 	 */
 	public String[] topVoterAllTime(int page) {
-		page = Math.max(1, page);
-		int pagesize = Math.max(1, plugin.getConfigFile().getFormatPageSize());
+		int pagesize = plugin.getConfigFile().getFormatPageSize();
 		ArrayList<String> msg = new ArrayList<>();
 		ArrayList<String> topVoters = new ArrayList<>();
 		int count = 1;
-		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.AllTime).entrySet()) {
+		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.AllTime).entrySet()) {
 			String line = plugin.getConfigFile().getFormatCommandsVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -664,8 +662,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterAllTime());
 		msg.add(MessageAPI.colorize(title));
 
-		long start = (long) (page - 1) * pagesize;
-		for (int i = (int) Math.min(start, topVoters.size()); i < topVoters.size() && i < start + pagesize; i++) {
+		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
 		}
 
@@ -679,12 +676,11 @@ public class TopVoterHandler implements Listener {
 	 * @return array of formatted top voter lines
 	 */
 	public String[] topVoterDaily(int page) {
-		page = Math.max(1, page);
-		int pagesize = Math.max(1, plugin.getConfigFile().getFormatPageSize());
+		int pagesize = plugin.getConfigFile().getFormatPageSize();
 		ArrayList<String> msg = new ArrayList<>();
 		ArrayList<String> topVoters = new ArrayList<>();
 		int count = 1;
-		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Daily).entrySet()) {
+		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Daily).entrySet()) {
 			String line = plugin.getConfigFile().getFormatCommandsVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -704,8 +700,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterDaily());
 		msg.add(MessageAPI.colorize(title));
 
-		long start = (long) (page - 1) * pagesize;
-		for (int i = (int) Math.min(start, topVoters.size()); i < topVoters.size() && i < start + pagesize; i++) {
+		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
 		}
 
@@ -719,12 +714,11 @@ public class TopVoterHandler implements Listener {
 	 * @return array of formatted top voter lines
 	 */
 	public String[] topVoterMonthly(int page) {
-		page = Math.max(1, page);
-		int pagesize = Math.max(1, plugin.getConfigFile().getFormatPageSize());
+		int pagesize = plugin.getConfigFile().getFormatPageSize();
 		ArrayList<String> msg = new ArrayList<>();
 		ArrayList<String> topVoters = new ArrayList<>();
 		int count = 1;
-		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Monthly).entrySet()) {
+		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Monthly).entrySet()) {
 			String line = plugin.getConfigFile().getFormatCommandsVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -744,8 +738,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterMonthly());
 		msg.add(MessageAPI.colorize(title));
 
-		long start = (long) (page - 1) * pagesize;
-		for (int i = (int) Math.min(start, topVoters.size()); i < topVoters.size() && i < start + pagesize; i++) {
+		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
 		}
 
@@ -759,7 +752,7 @@ public class TopVoterHandler implements Listener {
 	 */
 	public String[] topVotersAllTime() {
 		ArrayList<String> msg = new ArrayList<>();
-		List<Entry<TopVoterPlayer, Integer>> list = new LinkedList<>(plugin.getTopVoterDisplay(TopVoter.AllTime).entrySet());
+		List<Entry<TopVoterPlayer, Integer>> list = new LinkedList<>(plugin.getTopVoter(TopVoter.AllTime).entrySet());
 		int i = 0;
 		for (Entry<TopVoterPlayer, Integer> entry : list) {
 			String line = "%num%: %player%, %votes%";
@@ -785,8 +778,7 @@ public class TopVoterHandler implements Listener {
 	 */
 	public String[] topVotersDaily() {
 		ArrayList<String> msg = new ArrayList<>();
-		var board = plugin.getTopVoterDisplay(TopVoter.Daily);
-		ArrayList<TopVoterPlayer> users = new ArrayList<>(board.keySet());
+		ArrayList<TopVoterPlayer> users = new ArrayList<>(plugin.getTopVoter(TopVoter.Daily).keySet());
 		for (int i = 0; i < users.size(); i++) {
 			String line = "%num%: %player%, %votes%";
 			line = line.replace("%num%", "" + (i + 1));
@@ -795,7 +787,7 @@ public class TopVoterHandler implements Listener {
 			} catch (Exception ex) {
 				VotingPluginMain.plugin.debug(ex);
 			}
-			line = line.replace("%votes%", "" + board.get(users.get(i)));
+			line = line.replace("%votes%", "" + plugin.getTopVoter(TopVoter.Monthly).get(users.get(i)));
 			msg.add(line);
 		}
 
@@ -809,7 +801,7 @@ public class TopVoterHandler implements Listener {
 	 */
 	public String[] topVotersMonthly() {
 		ArrayList<String> msg = new ArrayList<>();
-		List<Entry<TopVoterPlayer, Integer>> list = new LinkedList<>(plugin.getTopVoterDisplay(TopVoter.Monthly).entrySet());
+		List<Entry<TopVoterPlayer, Integer>> list = new LinkedList<>(plugin.getTopVoter(TopVoter.Monthly).entrySet());
 		int i = 0;
 		for (Entry<TopVoterPlayer, Integer> entry : list) {
 			String line = "%num%: %player%, %votes%";
@@ -835,12 +827,11 @@ public class TopVoterHandler implements Listener {
 	 * @return array of formatted top voter lines
 	 */
 	public String[] topVoterWeekly(int page) {
-		page = Math.max(1, page);
-		int pagesize = Math.max(1, plugin.getConfigFile().getFormatPageSize());
+		int pagesize = plugin.getConfigFile().getFormatPageSize();
 		ArrayList<String> msg = new ArrayList<>();
 		ArrayList<String> topVoters = new ArrayList<>();
 		int count = 1;
-		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoterDisplay(TopVoter.Weekly).entrySet()) {
+		for (Entry<TopVoterPlayer, Integer> entry : plugin.getTopVoter(TopVoter.Weekly).entrySet()) {
 			String line = plugin.getConfigFile().getFormatCommandsVoteTopLine();
 			line = line.replace("%num%", "" + count);
 			line = line.replace("%player%", entry.getKey().getPlayerName());
@@ -860,8 +851,7 @@ public class TopVoterHandler implements Listener {
 		title = title.replace("%Top%", plugin.getConfigFile().getFormatTopVoterWeekly());
 		msg.add(MessageAPI.colorize(title));
 
-		long start = (long) (page - 1) * pagesize;
-		for (int i = (int) Math.min(start, topVoters.size()); i < topVoters.size() && i < start + pagesize; i++) {
+		for (int i = (page - 1) * pagesize; (i < topVoters.size()) && (i < (((page - 1) * pagesize) + 10)); i++) {
 			msg.add(topVoters.get(i));
 		}
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/topvoter/TopVoterPresenceIdentity.java

@@ -1,41 +0,0 @@
-package com.bencodez.votingplugin.topvoter;
-
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.function.Function;
-
-/** UUID-only evidence scopes; never resolves a profile or loads plugin/server storage. */
-public final class TopVoterPresenceIdentity {
-    private TopVoterPresenceIdentity() { }
-
-    /** A null alias explicitly prevents uncertain migration evidence becoming negative. */
-    public static List<UUID> identities(TopVoterPlayer row, boolean onlineMode, Function<String, String> cachedUuid) {
-        var identities = new ArrayList<UUID>();
-        if (row == null || row.getUuid() == null) { identities.add(null); return identities; }
-        identities.add(row.getUuid());
-        String name = row.getPlayerName();
-        if (name == null || name.isBlank() || name.length() > 64 || !name.equals(name.trim())) {
-            identities.add(null); return identities;
-        }
-        UUID offline = UUID.nameUUIDFromBytes(("OfflinePlayer:" + name).getBytes(StandardCharsets.UTF_8));
-        if (!identities.contains(offline)) identities.add(offline);
-        UUID current = null;
-        try {
-            String known = cachedUuid.apply(name);
-            if (known != null && !known.isBlank()) {
-                current = UUID.fromString(known);
-                if (!current.toString().equalsIgnoreCase(known)) { identities.add(null); return identities; }
-            }
-        } catch (RuntimeException unavailable) { identities.add(null); return identities; }
-        if (current != null && !identities.contains(current)) identities.add(current);
-        // This validates known aliases; online historical completeness is checked
-        // separately against retained server history by the asynchronous provider.
-        boolean resolvable = onlineMode ? row.getUuid().version() == 4 && row.getUuid().variant() == 2
-                && (current == null || current.equals(row.getUuid()))
-                : offline.equals(row.getUuid()) || offline.equals(current);
-        if (!resolvable) identities.add(null);
-        return identities;
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/user/SharedMysqlCacheReconciler.java

@@ -93,20 +93,10 @@ public final class SharedMysqlCacheReconciler {
 	public static void invalidateAndRefresh(VotingPluginMain plugin, String uuid, String... columns) {
 		invalidate(plugin, uuid, columns);
 		if (plugin == null || uuid == null) return;
-		String pointColumn = plugin.getBungeeSettings().isPerServerPoints()
-				? plugin.getBungeeSettings().getServerNameStorage() + "_Points" : "Points";
-		boolean affectsPoints = columns != null && java.util.Arrays.asList(columns).contains(pointColumn);
-		var placeholders = plugin.getPlaceholders();
-		java.util.function.Consumer<Boolean> completion = affectsPoints && placeholders != null
-				? placeholders.sharedPointRefillCompletion(UUID.fromString(uuid)) : null;
 		try {
-			plugin.getBukkitScheduler().runTaskAsynchronously(plugin,
-					() -> tryInvalidateAndRefreshOnWorker(plugin, uuid, columns));
+			plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid), false).cacheAsync();
 		} catch (RuntimeException refreshFailure) {
 			plugin.debug(refreshFailure);
-		} finally {
-			// This admission is not storage evidence. Only the actual worker can recover rendering.
-			if (completion != null) completion.accept(false);
 		}
 	}
 
@@ -116,37 +106,13 @@ public final class SharedMysqlCacheReconciler {
 	 * A failed refill leaves the snapshot explicitly unavailable, not false zero.
 	 */
 	public static void invalidateAndRefreshOnWorker(VotingPluginMain plugin, String uuid, String... columns) {
-		tryInvalidateAndRefreshOnWorker(plugin, uuid, columns);
-	}
-
-	static boolean tryInvalidateAndRefreshOnWorker(VotingPluginMain plugin, String uuid, String... columns) {
-		if (plugin == null || uuid == null) return false;
-		UUID playerUuid = UUID.fromString(uuid);
-		String pointColumn = plugin.getBungeeSettings().isPerServerPoints()
-				? plugin.getBungeeSettings().getServerNameStorage() + "_Points" : "Points";
-		boolean affectsPoints = columns != null && java.util.Arrays.asList(columns).contains(pointColumn);
-		var placeholders = plugin.getPlaceholders();
-		java.util.function.Consumer<Boolean> completion = affectsPoints && placeholders != null
-				? placeholders.sharedPointRefillCompletion(playerUuid) : null;
-		boolean verified = false;
+		invalidate(plugin, uuid, columns);
+		if (plugin == null || uuid == null) return;
 		try {
-			invalidate(plugin, uuid, columns);
-			var manager = plugin.getUserManager().getDataManager();
-			manager.cacheUser(playerUuid, null);
-			var cache = manager.getUserDataCache().get(playerUuid);
-			if (cache != null) synchronized (cache) {
-				// A complete published row may legitimately omit the selected points key.
-				// Rendering separately rejects present malformed/unsupported values.
-				verified = manager.getUserDataCache().get(playerUuid) == cache
-						&& cache.hasPublishedStorageSnapshot();
-			}
-			return true;
+			plugin.getUserManager().getDataManager().cacheUser(UUID.fromString(uuid), null);
 		} catch (RuntimeException refreshFailure) {
 			plugin.getLogger().warning("Shared MySQL cache refresh is unavailable after mutation; stale data was not published.");
 			plugin.debug(refreshFailure);
-			return false;
-		} finally {
-			if (completion != null) completion.accept(verified);
 		}
 	}
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/user/SharedMysqlPointMutator.java

@@ -21,7 +21,6 @@ import com.bencodez.simpleapi.sql.DataType;
 import com.bencodez.simpleapi.sql.data.DataValue;
 import com.bencodez.simpleapi.sql.data.DataValueInt;
 import com.bencodez.votingplugin.VotingPluginMain;
-import com.bencodez.votingplugin.placeholders.PlaceHolders;
 import com.bencodez.votingplugin.util.BukkitCompletionScheduler;
 
 /** Performs point writes that must remain atomic across shared MySQL servers. */
@@ -125,7 +124,7 @@ final class SharedMysqlPointMutator {
 			int previousTotal = cachedPoints(user, pointsColumn);
 			int predictedTotal = previousTotal + amount;
 			cachePredictedPoints(user, predictedTotal, pointsColumn);
-			if (!runPointMutation(user, () -> update(user, amount, false, pointsColumn), true)) {
+			if (!run(() -> update(user, amount, false, pointsColumn), true)) {
 				discardOptimisticPoints(user, pointsColumn);
 				if (failOnRejectedAdmission) throw new IllegalStateException("Point mutation storage worker is unavailable");
 				return previousTotal;
@@ -186,29 +185,16 @@ final class SharedMysqlPointMutator {
 
 	AddResult addCommittedToColumn(VotingPluginUser user, int amount, String operationId, String pointsColumn) {
 		if (operationId == null || operationId.isEmpty()) return addCommittedToColumn(user, amount, pointsColumn);
-		var placeholders = plugin.getPlaceholders();
-		UUID uuid = UUID.fromString(user.getUUID());
-		if (placeholders != null) placeholders.beginSharedPointDebit(uuid);
-		boolean confirmed = false;
+		drainCache(user, pointsColumn);
 		try {
-			drainCache(user, pointsColumn);
 			SharedPointAdditionJournal.AdditionResult result = SharedPointAdditionJournal.forTable(plugin.getMysql())
 					.add(operationId, user.getUUID(), pointsColumn, amount, System.currentTimeMillis());
-			confirmed = true;
 			return new AddResult(true, result.total());
 		} catch (SQLException failure) {
 			logFailure(failure);
 			return new AddResult(MutationOutcome.INDETERMINATE, 0);
 		} finally {
-			boolean refreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, user.getUUID(), pointsColumn);
-			if (placeholders != null) {
-				var cache = plugin.getUserManager().getDataManager().getUserDataCache().get(uuid);
-				boolean available = false;
-				if (cache != null) synchronized (cache) {
-					available = refreshed && confirmed && cache.hasPublishedStorageSnapshot();
-				}
-				placeholders.finishSharedPointDebit(uuid, confirmed, available);
-			}
+			discardPointsCache(user, pointsColumn);
 		}
 	}
 
@@ -223,36 +209,18 @@ final class SharedMysqlPointMutator {
 
 	AddResult removeCommittedFromColumn(VotingPluginUser user, int amount, String operationId, String pointsColumn) {
 		if (operationId == null || operationId.isEmpty()) return new AddResult(false, 0);
-		var placeholders = plugin.getPlaceholders();
-		UUID uuid = UUID.fromString(user.getUUID());
-		if (placeholders != null) placeholders.beginSharedPointDebit(uuid);
-		AddResult outcome = new AddResult(MutationOutcome.INDETERMINATE, 0);
-		boolean refreshed;
+		drainCache(user, pointsColumn);
 		try {
-			drainCache(user, pointsColumn);
 			SharedPointAdditionJournal.AdditionResult result = SharedPointAdditionJournal.forTable(plugin.getMysql())
 					.subtract(operationId, user.getUUID(), pointsColumn, amount, System.currentTimeMillis());
-			outcome = new AddResult(true, result.total());
+			return new AddResult(true, result.total());
 		} catch (SQLException failure) {
-			if (failure instanceof SharedPointAdditionJournal.DebitRejectedException) {
-				outcome = new AddResult(MutationOutcome.REJECTED, 0);
-			} else {
-				logFailure(failure);
-				outcome = new AddResult(MutationOutcome.INDETERMINATE, 0);
-			}
+			logFailure(failure);
+			return new AddResult(failure instanceof SharedPointAdditionJournal.DebitRejectedException
+					? MutationOutcome.REJECTED : MutationOutcome.INDETERMINATE, 0);
 		} finally {
-			refreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, user.getUUID(), pointsColumn);
-			if (placeholders != null) {
-				var cache = plugin.getUserManager().getDataManager().getUserDataCache().get(uuid);
-				boolean available = false;
-				if (cache != null) synchronized (cache) {
-					available = refreshed && outcome.outcome() != MutationOutcome.INDETERMINATE
-							&& cache.hasPublishedStorageSnapshot();
-				}
-				placeholders.finishSharedPointDebit(uuid, outcome.outcome() != MutationOutcome.INDETERMINATE, available);
-			}
+			discardPointsCache(user, pointsColumn);
 		}
-		return new AddResult(outcome.outcome(), outcome.total(), refreshed);
 	}
 
 	/** Looks up a completed retry before its Bukkit receive event is dispatched. */
@@ -358,20 +326,7 @@ final class SharedMysqlPointMutator {
 
 	boolean set(VotingPluginUser user, int value, boolean async) {
 		String pointsColumn = user.getPointsPath();
-		var placeholders = plugin.getPlaceholders();
-		Consumer<Boolean> admission = placeholders == null ? null
-				: placeholders.sharedPointAdmissionCompletion(UUID.fromString(user.getUUID()));
-		boolean accepted = run(() -> {
-			boolean settled = false;
-			try {
-				setAbsolute(user, value, pointsColumn);
-				settled = true;
-			} finally {
-				if (admission != null) admission.accept(settled);
-			}
-		}, async);
-		if (!accepted && admission != null) admission.accept(false);
-		return accepted;
+		return run(() -> setAbsolute(user, value, pointsColumn), async);
 	}
 
 	boolean setCommitted(VotingPluginUser user, int value) {
@@ -384,7 +339,7 @@ final class SharedMysqlPointMutator {
 
 	void cap(VotingPluginUser user, int maximum, boolean async) {
 		String pointsColumn = user.getPointsPath();
-		runPointMutation(user, () -> capAt(user, maximum, pointsColumn), async);
+		run(() -> capAt(user, maximum, pointsColumn), async);
 	}
 
 	/**
@@ -402,7 +357,7 @@ final class SharedMysqlPointMutator {
 		int predictedTotal = (int) Math.max(Integer.MIN_VALUE,
 				Math.min((long) previousTotal + amount, maximum));
 		cachePredictedPoints(user, predictedTotal, pointsColumn);
-		if (!runPointMutation(user, () -> addAndCapAt(user, amount, maximum, pointsColumn), true)) {
+		if (!run(() -> addAndCapAt(user, amount, maximum, pointsColumn), true)) {
 			discardOptimisticPoints(user, pointsColumn);
 		}
 	}
@@ -415,7 +370,7 @@ final class SharedMysqlPointMutator {
 		if (!async) return remove(user, amount);
 		String pointsColumn = user.getPointsPath();
 		boolean predictedSuccess = cachedPoints(user, pointsColumn) >= amount;
-		boolean submitted = runPointMutation(user, () -> update(user, -amount, true, pointsColumn), true);
+		boolean submitted = run(() -> update(user, -amount, true, pointsColumn), true);
 		// Preserve the historical asynchronous API contract: the caller receives
 		// the cached prediction while the conditional database debit runs later.
 		return submitted && predictedSuccess;
@@ -543,40 +498,41 @@ final class SharedMysqlPointMutator {
 		org.bukkit.entity.Player approvalPlayer = targetPlayer != null ? targetPlayer : sourcePlayer;
 		String sourcePoints = source.getPointsPath();
 		String targetPoints = target.getPointsPath();
-		var reservationPublication = beginPointPublication(source);
 		try {
 			plugin.getTimer().execute(() -> {
-				MySQL table = plugin.getMysql();
-				String transferId = UUID.randomUUID().toString();
-				String owner = UUID.randomUUID().toString();
-				SharedPointTransferJournal prepared = null;
-				boolean known = true;
-				boolean reserved = false;
-				PointTransferResult failed = PointTransferResult.UNAVAILABLE;
 				try {
 					drainCache(source);
 					drainCache(target);
-					prepared = SharedPointTransferJournal.forTable(table);
-					recoverTransfers(plugin, prepared);
-					known = false;
-					reserved = prepared.reserve(transferId, source.getUUID(), sourcePoints, debitAmount,
-							target.getUUID(), debitAmount, System.currentTimeMillis());
-					known = true;
-					failed = PointTransferResult.INSUFFICIENT_POINTS;
-				} catch (SQLException failure) {
-					known |= failure instanceof SharedPointTransferJournal.PreparationFailure;
-					logFailure(failure);
 				} catch (RuntimeException cacheFailure) {
 					plugin.debug(cacheFailure);
-				} finally {
-					boolean refreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, source.getUUID(), sourcePoints);
-					finishPointPublication(reservationPublication, source, sourcePoints, known, refreshed);
-				}
-				if (!reserved) {
-					completeOnBukkit(sourcePlayer, completion, failed);
+					completeOnBukkit(sourcePlayer, completion, PointTransferResult.UNAVAILABLE);
+					return;
+				}
+				MySQL table = plugin.getMysql();
+				String transferId = UUID.randomUUID().toString();
+				String owner = UUID.randomUUID().toString();
+				SharedPointTransferJournal journal;
+				try {
+					journal = SharedPointTransferJournal.forTable(table);
+					recoverTransfers(plugin, journal);
+					if (!journal.reserve(transferId, source.getUUID(), sourcePoints, debitAmount, target.getUUID(),
+							debitAmount, System.currentTimeMillis())) {
+						completeOnBukkit(sourcePlayer, completion, PointTransferResult.INSUFFICIENT_POINTS);
+						return;
+					}
+					// The source cache may have been recreated while the reservation was being
+					// committed. Invalidate its points after the durable debit, before any later
+					// dump can restore the pre-debit balance.
+					discardPointsCache(source, sourcePoints);
+				} catch (SQLException failure) {
+					// An acknowledgement/confirmation failure can follow a committed
+					// reservation debit. Never allow a cache recreated during the unknown
+					// outcome to flush the pre-debit source balance over it.
+					discardPointsCache(source, sourcePoints);
+					logFailure(failure);
+					completeOnBukkit(sourcePlayer, completion, PointTransferResult.UNAVAILABLE);
 					return;
 				}
-				SharedPointTransferJournal journal = prepared;
 
 				/*
 				 * Do not claim the reservation until the Bukkit approval task has actually
@@ -606,7 +562,6 @@ final class SharedMysqlPointMutator {
 			// No reservation exists when the initial persistence task is rejected.
 			// Still complete the command contract on the source entity lane.
 			plugin.debug(schedulingFailure);
-			finishPointPublication(reservationPublication, source, sourcePoints, true, false);
 			completeOnBukkit(sourcePlayer, completion, PointTransferResult.UNAVAILABLE);
 		}
 	}
@@ -619,7 +574,8 @@ final class SharedMysqlPointMutator {
 				System.currentTimeMillis());
 		if (claim == SharedPointTransferJournal.ClaimOutcome.NOT_CLAIMED) {
 			try {
-				refundReservedWithPublication(source, journal, transferId, sourcePoints, debitAmount);
+				journal.refundReserved(transferId, source.getUUID(), sourcePoints, debitAmount);
+				discardPointsCache(source, sourcePoints);
 			} catch (SQLException failure) {
 				logFailure(failure);
 			}
@@ -757,7 +713,10 @@ final class SharedMysqlPointMutator {
 		} catch (SQLException markerFailure) {
 			boolean refunded = false;
 			try {
-				refunded = refundClaimedWithPublication(source, journal, transferId, sourcePoints, debitAmount);
+				refunded = journal.refundHookStarted(transferId, source.getUUID(), sourcePoints, debitAmount);
+				if (refunded) {
+					discardPointsCache(source, sourcePoints);
+				}
 			} catch (SQLException refundFailure) {
 				logFailure(refundFailure);
 			}
@@ -777,24 +736,17 @@ final class SharedMysqlPointMutator {
 			int debitAmount,
 			Consumer<PointTransferResult> completion, SharedPointTransferJournal journal, String transferId, String owner,
 			String sourcePoints, String targetPoints, Integer approvedAmount) {
-		var sourcePublication = beginPointPublication(source);
-		var targetPublication = beginPointPublication(target);
-		boolean known = false;
 		PointTransferResult result;
 		try {
 			// The hook may have recreated either cache while it ran on Bukkit.
-
+			drainCache(target);
 			SharedPointTransferJournal.SettlementOutcome outcome;
 			try {
-				drainCache(target);
 				outcome = journal.settleWithConfirmation(transferId, owner, source.getUUID(), sourcePoints,
 						target.getUUID(), targetPoints, debitAmount, approvedAmount);
-				known = outcome != SharedPointTransferJournal.SettlementOutcome.INDETERMINATE;
 			} finally {
-				boolean sourceRefreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, source.getUUID(), sourcePoints);
-				boolean targetRefreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, target.getUUID(), targetPoints);
-				finishPointPublication(sourcePublication, source, sourcePoints, known, sourceRefreshed);
-				finishPointPublication(targetPublication, target, targetPoints, known, targetRefreshed);
+				discardPointsCache(source, sourcePoints);
+				discardPointsCache(target, targetPoints);
 			}
 			result = outcome == SharedPointTransferJournal.SettlementOutcome.COMPLETED ? PointTransferResult.SUCCESS
 					: outcome == SharedPointTransferJournal.SettlementOutcome.REFUNDED ? PointTransferResult.CANCELLED
@@ -808,29 +760,14 @@ final class SharedMysqlPointMutator {
 		completeOnBukkit(sourcePlayer, completion, result);
 	}
 
-	private boolean refundReservedWithPublication(VotingPluginUser source, SharedPointTransferJournal journal,
-			String transferId, String sourcePoints, int debitAmount) throws SQLException {
-		var publication = beginPointPublication(source);
-		boolean known = false;
-		try {
-			boolean refunded = journal.refundReserved(transferId, source.getUUID(), sourcePoints, debitAmount);
-			known = true;
-			return refunded;
-		} catch (SQLException failure) {
-			known = failure instanceof SharedPointTransferJournal.PreparationFailure;
-			throw failure;
-		} finally {
-			boolean refreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, source.getUUID(), sourcePoints);
-			finishPointPublication(publication, source, sourcePoints, known, refreshed);
-		}
-	}
-
 	private void refundReservedAfterSchedulingFailure(VotingPluginUser source, org.bukkit.entity.Player sourcePlayer,
 			Consumer<PointTransferResult> completion,
 			SharedPointTransferJournal journal, String transferId, String sourcePoints, int debitAmount,
 			RuntimeException failure) {
 		try {
-			refundReservedWithPublication(source, journal, transferId, sourcePoints, debitAmount);
+			if (journal.refundReserved(transferId, source.getUUID(), sourcePoints, debitAmount)) {
+				discardPointsCache(source, sourcePoints);
+			}
 		} catch (SQLException refundFailure) {
 			logFailure(refundFailure);
 		}
@@ -846,23 +783,24 @@ final class SharedMysqlPointMutator {
 			// HOOK_STARTED is safe to compensate because the approval task has not
 			// been submitted yet. A RESERVED row is handled by its normal refund.
 			if (journal.markCompensating(transferId)) {
-				refunded = refundClaimedWithPublication(source, journal, transferId, sourcePoints, debitAmount);
+				refunded = journal.refundHookStarted(transferId, source.getUUID(), sourcePoints, debitAmount);
 			} else {
-				refunded = refundReservedWithPublication(source, journal, transferId, sourcePoints, debitAmount);
+				refunded = journal.refundReserved(transferId, source.getUUID(), sourcePoints, debitAmount);
 			}
 		} catch (SQLException markerFailure) {
 			// A lost marker acknowledgement may still have committed. Both refund
 			// operations are idempotent and cover either durable pre-hook state.
 			try {
-				refunded = refundClaimedWithPublication(source, journal, transferId, sourcePoints, debitAmount);
+				refunded = journal.refundHookStarted(transferId, source.getUUID(), sourcePoints, debitAmount);
 				if (!refunded) {
-					refunded = refundReservedWithPublication(source, journal, transferId, sourcePoints, debitAmount);
+					refunded = journal.refundReserved(transferId, source.getUUID(), sourcePoints, debitAmount);
 				}
 			} catch (SQLException refundFailure) {
 				logFailure(refundFailure);
 			}
 			logFailure(markerFailure);
 		}
+		if (refunded) discardPointsCache(source, sourcePoints);
 		if (!refunded) {
 			rememberPendingCompensationMarker(plugin, transferId);
 			logIndeterminateClaim(transferId);
@@ -877,32 +815,19 @@ final class SharedMysqlPointMutator {
 		completeOnBukkit(sourcePlayer, completion, PointTransferResult.UNAVAILABLE);
 	}
 
-	private boolean refundClaimedWithPublication(VotingPluginUser source, SharedPointTransferJournal journal,
-			String transferId, String sourcePoints, int debitAmount) throws SQLException {
-		var publication = beginPointPublication(source);
-		boolean known = false;
-		try {
-			boolean refunded = journal.refundHookStarted(transferId, source.getUUID(), sourcePoints, debitAmount);
-			known = true;
-			return refunded;
-		} catch (SQLException refundFailure) {
-			known = refundFailure instanceof SharedPointTransferJournal.PreparationFailure;
-			throw refundFailure;
-		} finally {
-			// A later guarded fallback or refill cannot erase an earlier ambiguous write.
-			boolean refreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, source.getUUID(), sourcePoints);
-			finishPointPublication(publication, source, sourcePoints, known, refreshed);
-		}
-	}
-
 	void refundClaimedAfterSchedulingFailure(VotingPluginUser source, org.bukkit.entity.Player sourcePlayer,
 			Consumer<PointTransferResult> completion,
 			SharedPointTransferJournal journal, String transferId, String sourcePoints, int debitAmount,
 			RuntimeException failure) {
 		try {
-			refundClaimedWithPublication(source, journal, transferId, sourcePoints, debitAmount);
+			journal.refundHookStarted(transferId, source.getUUID(), sourcePoints, debitAmount);
 		} catch (SQLException refundFailure) {
 			logFailure(refundFailure);
+		} finally {
+			// The refund may have committed even when its acknowledgement and
+			// confirmation read both failed. Invalidate a cache recreated after the
+			// original debit so it cannot later overwrite either durable outcome.
+			discardPointsCache(source, sourcePoints);
 		}
 		plugin.debug(failure);
 		completeOnBukkit(sourcePlayer, completion, PointTransferResult.UNAVAILABLE);
@@ -965,23 +890,6 @@ final class SharedMysqlPointMutator {
 		}
 	}
 
-	private boolean runPointMutation(VotingPluginUser user, Runnable operation, boolean async) {
-		PlaceHolders placeholders = plugin.getPlaceholders();
-		Consumer<Boolean> admission = placeholders == null ? null
-				: placeholders.sharedPointAdmissionCompletion(UUID.fromString(user.getUUID()));
-		boolean accepted = run(() -> {
-			boolean settled = false;
-			try {
-				operation.run();
-				settled = true;
-			} finally {
-				if (admission != null) admission.accept(settled);
-			}
-		}, async);
-		if (!accepted && admission != null) admission.accept(false);
-		return accepted;
-	}
-
 	private boolean run(Runnable operation, boolean async) {
 		if (async) {
 			try {
@@ -1002,34 +910,25 @@ final class SharedMysqlPointMutator {
 	}
 
 	private boolean update(VotingPluginUser user, int delta, boolean requireNonnegative, String points) {
-		PlaceHolders publication = beginPointPublication(user);
-		// Classify this arithmetic statement; an earlier uncertain operation stays fenced.
-		boolean known = true;
-		try {
-			drainCache(user, points);
-			MySQL table = plugin.getMysql();
-			StringBuilder sql = new StringBuilder("UPDATE ").append(table.qi(table.getTableName())).append(" SET ")
-					.append(table.qi(points)).append(" = COALESCE(").append(table.qi(points)).append(", 0) + ? WHERE ")
-					.append(table.qi("uuid")).append(table.getDbType() == DbType.POSTGRESQL ? " = ?::uuid" : " = ?");
-			if (requireNonnegative) {
-				sql.append(" AND COALESCE(").append(table.qi(points)).append(", 0) >= ?");
-			}
-			try (Connection connection = requireConnection(table);
-					PreparedStatement statement = connection.prepareStatement(sql.toString())) {
-				statement.setInt(1, delta);
-				statement.setString(2, user.getUUID());
-				if (requireNonnegative) statement.setInt(3, -delta);
-				known = false;
-				int affected = statement.executeUpdate();
-				known = true;
-				return affected == 1;
-			} catch (SQLException failure) {
-				logFailure(failure);
-				return false;
-			}
+		drainCache(user, points);
+		MySQL table = plugin.getMysql();
+		StringBuilder sql = new StringBuilder("UPDATE ").append(table.qi(table.getTableName())).append(" SET ")
+				.append(table.qi(points)).append(" = COALESCE(").append(table.qi(points)).append(", 0) + ? WHERE ")
+				.append(table.qi("uuid")).append(table.getDbType() == DbType.POSTGRESQL ? " = ?::uuid" : " = ?");
+		if (requireNonnegative) {
+			sql.append(" AND COALESCE(").append(table.qi(points)).append(", 0) >= ?");
+		}
+		try (Connection connection = requireConnection(table);
+				PreparedStatement statement = connection.prepareStatement(sql.toString())) {
+			statement.setInt(1, delta);
+			statement.setString(2, user.getUUID());
+			if (requireNonnegative) statement.setInt(3, -delta);
+			return statement.executeUpdate() == 1;
+		} catch (SQLException failure) {
+			logFailure(failure);
+			return false;
 		} finally {
-			boolean refreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, user.getUUID(), points);
-			finishPointPublication(publication, user, points, known, refreshed);
+			discardPointsCache(user, points);
 		}
 	}
 
@@ -1047,74 +946,53 @@ final class SharedMysqlPointMutator {
 	}
 
 	private AddResult addAndReadCommittedResult(VotingPluginUser user, int amount, String points) {
-		PlaceHolders publication = beginPointPublication(user);
-		// Classify this arithmetic statement; an earlier uncertain operation stays fenced.
-		boolean known = true;
-		boolean refreshed = false;
-		try {
-			try {
-				drainCache(user, points);
-			} catch (RuntimeException preparationFailure) {
-				// No arithmetic statement was submitted. Cache retirement may itself
-				// perform I/O; its failure is not proof this addition ran.
-				plugin.debug(preparationFailure);
-				return new AddResult(MutationOutcome.REJECTED, 0);
-			}
-			MySQL table = plugin.getMysql();
-			String uuidMatch = table.qi("uuid") + (table.getDbType() == DbType.POSTGRESQL ? " = ?::uuid" : " = ?");
-			String update = "UPDATE " + table.qi(table.getTableName()) + " SET " + table.qi(points) + " = COALESCE("
-					+ table.qi(points) + ", 0) + ? WHERE " + uuidMatch;
-			String read = "SELECT " + table.qi(points) + " FROM " + table.qi(table.getTableName()) + " WHERE " + uuidMatch;
-			boolean updateCommitted = false;
-			Integer committedTotal = null;
-			try (Connection connection = requireConnection(table);
-					PreparedStatement updateStatement = connection.prepareStatement(update);
-					PreparedStatement readStatement = connection.prepareStatement(read)) {
-				updateStatement.setInt(1, amount);
-				updateStatement.setString(2, user.getUUID());
-				known = false;
-				int affected = updateStatement.executeUpdate();
-				known = true;
-				if (affected == 1) {
-					// With JDBC auto-commit, executeUpdate returning one means the mutation
-					// completed. A later read may still fail after the points have been
-					// committed, so never turn that outcome into a retryable failure.
-					updateCommitted = true;
-					readStatement.setString(1, user.getUUID());
-					try (java.sql.ResultSet result = readStatement.executeQuery()) {
-						if (result.next()) committedTotal = result.getInt(1);
-					}
+		drainCache(user, points);
+		MySQL table = plugin.getMysql();
+		String uuidMatch = table.qi("uuid") + (table.getDbType() == DbType.POSTGRESQL ? " = ?::uuid" : " = ?");
+		String update = "UPDATE " + table.qi(table.getTableName()) + " SET " + table.qi(points) + " = COALESCE("
+				+ table.qi(points) + ", 0) + ? WHERE " + uuidMatch;
+		String read = "SELECT " + table.qi(points) + " FROM " + table.qi(table.getTableName()) + " WHERE " + uuidMatch;
+		boolean updateCommitted = false;
+		Integer committedTotal = null;
+		try (Connection connection = requireConnection(table);
+				PreparedStatement updateStatement = connection.prepareStatement(update);
+				PreparedStatement readStatement = connection.prepareStatement(read)) {
+			updateStatement.setInt(1, amount);
+			updateStatement.setString(2, user.getUUID());
+			if (updateStatement.executeUpdate() == 1) {
+				// With JDBC auto-commit, executeUpdate returning one means the mutation
+				// completed. A later read may still fail after the points have been
+				// committed, so never turn that outcome into a retryable failure.
+				updateCommitted = true;
+				readStatement.setString(1, user.getUUID());
+				try (java.sql.ResultSet result = readStatement.executeQuery()) {
+					if (result.next()) committedTotal = result.getInt(1);
 				}
-			} catch (SQLException failure) {
-				logFailure(failure);
-			} finally {
-				refreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, user.getUUID(), points);
 			}
-			// Do not evaluate the fallback while the JDBC handle is still held. With a
-			// one-connection pool, getPoints() may need that same handle after a missing
-			// row or a failed follow-up read.
-			if (committedTotal != null) return new AddResult(true, committedTotal);
-			// A failed acquisition cannot support the fallback read either. Report the
-			// mutation failure without checking out a second connection and let callers
-			// complete their callback deterministically.
-			if (!updateCommitted) return new AddResult(known ? MutationOutcome.REJECTED : MutationOutcome.INDETERMINATE, 0);
-			// A live mode reload can change getPointsPath() while this queued write is
-			// running. Keep the fallback on the column that received the credit.
-			if (!points.equals(user.getPointsPath())) return new AddResult(true, user.getUserData().getInt(points));
-			return new AddResult(true, user.getPoints());
+		} catch (SQLException failure) {
+			logFailure(failure);
 		} finally {
-			finishPointPublication(publication, user, points, known, refreshed);
+			discardPointsCache(user, points);
 		}
+		// Do not evaluate the fallback while the JDBC handle is still held. With a
+		// one-connection pool, getPoints() may need that same handle after a missing
+		// row or a failed follow-up read.
+		if (committedTotal != null) return new AddResult(true, committedTotal);
+		// A failed acquisition cannot support the fallback read either. Report the
+		// mutation failure without checking out a second connection and let callers
+		// complete their callback deterministically.
+		if (!updateCommitted) return new AddResult(false, 0);
+		// A live mode reload can change getPointsPath() while this queued write is
+		// running. Keep the fallback on the column that received the credit.
+		if (!points.equals(user.getPointsPath())) return new AddResult(true, user.getUserData().getInt(points));
+		return new AddResult(true, user.getPoints());
 	}
 
 	enum MutationOutcome { CONFIRMED, REJECTED, INDETERMINATE }
 
-	record AddResult(MutationOutcome outcome, int total, boolean sourceRefreshed) {
-		AddResult(MutationOutcome outcome, int total) {
-			this(outcome, total, false);
-		}
+	record AddResult(MutationOutcome outcome, int total) {
 		AddResult(boolean success, int total) {
-			this(success ? MutationOutcome.CONFIRMED : MutationOutcome.INDETERMINATE, total, false);
+			this(success ? MutationOutcome.CONFIRMED : MutationOutcome.INDETERMINATE, total);
 		}
 		boolean success() { return outcome == MutationOutcome.CONFIRMED; }
 	}
@@ -1124,29 +1002,21 @@ final class SharedMysqlPointMutator {
 	}
 
 	private boolean setAbsolute(VotingPluginUser user, int value, String points) {
-		var publication = beginPointPublication(user);
-		boolean known = true;
-		try {
-			drainCache(user, points);
-			MySQL table = plugin.getMysql();
-			String sql = "UPDATE " + table.qi(table.getTableName()) + " SET " + table.qi(points)
-					+ " = ? WHERE " + table.qi("uuid")
-					+ (table.getDbType() == DbType.POSTGRESQL ? " = ?::uuid" : " = ?");
-			try (Connection connection = requireConnection(table);
-					PreparedStatement statement = connection.prepareStatement(sql)) {
-				statement.setInt(1, value);
-				statement.setString(2, user.getUUID());
-				known = false;
-				int affected = statement.executeUpdate();
-				known = true;
-				return affected == 1;
-			} catch (SQLException failure) {
-				logFailure(failure);
-				return false;
-			}
+		drainCache(user, points);
+		MySQL table = plugin.getMysql();
+		String sql = "UPDATE " + table.qi(table.getTableName()) + " SET " + table.qi(points)
+				+ " = ? WHERE " + table.qi("uuid")
+				+ (table.getDbType() == DbType.POSTGRESQL ? " = ?::uuid" : " = ?");
+		try (Connection connection = requireConnection(table);
+				PreparedStatement statement = connection.prepareStatement(sql)) {
+			statement.setInt(1, value);
+			statement.setString(2, user.getUUID());
+			return statement.executeUpdate() == 1;
+		} catch (SQLException failure) {
+			logFailure(failure);
+			return false;
 		} finally {
-			boolean refreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, user.getUUID(), points);
-			finishPointPublication(publication, user, points, known, refreshed);
+			discardPointsCache(user, points);
 		}
 	}
 
@@ -1155,28 +1025,20 @@ final class SharedMysqlPointMutator {
 	}
 
 	private void capAt(VotingPluginUser user, int maximum, String points) {
-		PlaceHolders publication = beginPointPublication(user);
-		// Classify this arithmetic statement; an earlier uncertain operation stays fenced.
-		boolean known = true;
-		try {
-			drainCache(user, points);
-			MySQL table = plugin.getMysql();
-			String sql = "UPDATE " + table.qi(table.getTableName()) + " SET " + table.qi(points) + " = LEAST(COALESCE("
-					+ table.qi(points) + ", 0), ?) WHERE " + table.qi("uuid")
-					+ (table.getDbType() == DbType.POSTGRESQL ? " = ?::uuid" : " = ?");
-			try (Connection connection = requireConnection(table);
-					PreparedStatement statement = connection.prepareStatement(sql)) {
-				statement.setInt(1, maximum);
-				statement.setString(2, user.getUUID());
-				known = false;
-				statement.executeUpdate();
-				known = true;
-			} catch (SQLException failure) {
-				logFailure(failure);
-			}
+		drainCache(user, points);
+		MySQL table = plugin.getMysql();
+		String sql = "UPDATE " + table.qi(table.getTableName()) + " SET " + table.qi(points) + " = LEAST(COALESCE("
+				+ table.qi(points) + ", 0), ?) WHERE " + table.qi("uuid")
+				+ (table.getDbType() == DbType.POSTGRESQL ? " = ?::uuid" : " = ?");
+		try (Connection connection = requireConnection(table);
+				PreparedStatement statement = connection.prepareStatement(sql)) {
+			statement.setInt(1, maximum);
+			statement.setString(2, user.getUUID());
+			statement.executeUpdate();
+		} catch (SQLException failure) {
+			logFailure(failure);
 		} finally {
-			boolean refreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, user.getUUID(), points);
-			finishPointPublication(publication, user, points, known, refreshed);
+			discardPointsCache(user, points);
 		}
 	}
 
@@ -1185,29 +1047,21 @@ final class SharedMysqlPointMutator {
 	}
 
 	private void addAndCapAt(VotingPluginUser user, int amount, int maximum, String points) {
-		PlaceHolders publication = beginPointPublication(user);
-		// Classify this arithmetic statement; an earlier uncertain operation stays fenced.
-		boolean known = true;
-		try {
-			drainCache(user, points);
-			MySQL table = plugin.getMysql();
-			String sql = "UPDATE " + table.qi(table.getTableName()) + " SET " + table.qi(points) + " = LEAST(COALESCE("
-					+ table.qi(points) + ", 0) + ?, ?) WHERE " + table.qi("uuid")
-					+ (table.getDbType() == DbType.POSTGRESQL ? " = ?::uuid" : " = ?");
-			try (Connection connection = requireConnection(table);
-					PreparedStatement statement = connection.prepareStatement(sql)) {
-				statement.setInt(1, amount);
-				statement.setInt(2, maximum);
-				statement.setString(3, user.getUUID());
-				known = false;
-				statement.executeUpdate();
-				known = true;
-			} catch (SQLException failure) {
-				logFailure(failure);
-			}
+		drainCache(user, points);
+		MySQL table = plugin.getMysql();
+		String sql = "UPDATE " + table.qi(table.getTableName()) + " SET " + table.qi(points) + " = LEAST(COALESCE("
+				+ table.qi(points) + ", 0) + ?, ?) WHERE " + table.qi("uuid")
+				+ (table.getDbType() == DbType.POSTGRESQL ? " = ?::uuid" : " = ?");
+		try (Connection connection = requireConnection(table);
+				PreparedStatement statement = connection.prepareStatement(sql)) {
+			statement.setInt(1, amount);
+			statement.setInt(2, maximum);
+			statement.setString(3, user.getUUID());
+			statement.executeUpdate();
+		} catch (SQLException failure) {
+			logFailure(failure);
 		} finally {
-			boolean refreshed = SharedMysqlCacheReconciler.tryInvalidateAndRefreshOnWorker(plugin, user.getUUID(), points);
-			finishPointPublication(publication, user, points, known, refreshed);
+			discardPointsCache(user, points);
 		}
 	}
 
@@ -1247,27 +1101,6 @@ final class SharedMysqlPointMutator {
 	 * deliberately not discarded here because it is a distinct, later write and
 	 * the generic absolute-value API cannot provide cross-server atomic semantics.
 	 */
-	private com.bencodez.votingplugin.placeholders.PlaceHolders beginPointPublication(VotingPluginUser user) {
-		var placeholders = plugin.getPlaceholders();
-		if (placeholders != null) placeholders.beginSharedPointDebit(UUID.fromString(user.getUUID()));
-		return placeholders;
-	}
-
-	private void finishPointPublication(com.bencodez.votingplugin.placeholders.PlaceHolders placeholders,
-			VotingPluginUser user, String column, boolean known, boolean refreshed) {
-		if (placeholders == null) return;
-		UUID uuid = UUID.fromString(user.getUUID());
-		var caches = plugin.getUserManager().getDataManager().getUserDataCache();
-		var cache = caches.get(uuid);
-		boolean available = false;
-		if (cache != null) synchronized (cache) {
-			available = known && refreshed && caches.get(uuid) == cache && cache.hasPublishedStorageSnapshot()
-					&& column.equals(user.getPointsPath())
-					&& plugin.isEnabled() && plugin.getPlaceholders() == placeholders;
-		}
-		placeholders.finishSharedPointDebit(uuid, known, available);
-	}
-
 	private void discardPointsCache(VotingPluginUser user) {
 		discardPointsCache(user, user.getPointsPath());
 	}

VotingPlugin/src/main/java/com/bencodez/votingplugin/user/SharedPointTransferJournal.java

@@ -28,14 +28,6 @@ import com.bencodez.simpleapi.sql.mysql.DbType;
  * settlement is a second short, idempotent transaction.</p>
  */
 final class SharedPointTransferJournal {
-	/** Positive proof that this invocation did not attempt a points write. */
-	static final class PreparationFailure extends SQLException {
-		private static final long serialVersionUID = 1L;
-		PreparationFailure(SQLException cause) {
-			super(cause.getMessage(), cause.getSQLState(), cause.getErrorCode(), cause);
-		}
-	}
-
 	private static final String RESERVED = "RESERVED";
 	private static final String HOOK_STARTED = "HOOK_STARTED";
 	/*
@@ -152,59 +144,51 @@ final class SharedPointTransferJournal {
 	 */
 	boolean reserve(String transferId, String sourceUuid, String sourcePointsColumn, int debitPoints, String targetUuid,
 			int requestedCreditPoints, long now) throws SQLException {
-		boolean pointWriteAttempted = false;
-		try {
-			TransferRow existing = find(transferId);
-			if (existing != null) {
-				return existing.matches(sourceUuid, targetUuid, debitPoints, requestedCreditPoints)
-						&& !REFUNDED.equals(existing.state);
-			}
+		TransferRow existing = find(transferId);
+		if (existing != null) {
+			return existing.matches(sourceUuid, targetUuid, debitPoints, requestedCreditPoints)
+					&& !REFUNDED.equals(existing.state);
+		}
 
-			String insert = "INSERT INTO " + qiJournal() + " (" + qi("transfer_id") + ", " + qi("source_uuid")
-					+ ", " + qi("source_points_column") + ", " + qi("target_uuid") + ", " + qi("debit_points")
-					+ ", " + qi("requested_credit_points") + ", " + qi("state") + ", " + qi("created_at")
-					+ ") VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
-			String points = qi(sourcePointsColumn);
-			String debit = "UPDATE " + qi(table.getTableName()) + " SET " + points + " = " + points
-					+ " - ? WHERE " + qi("uuid") + uuidCast() + " AND " + points + " >= ?";
-			try (Connection connection = connection()) {
-				connection.setAutoCommit(false);
-				try (PreparedStatement insertStatement = connection.prepareStatement(insert);
-						PreparedStatement debitStatement = connection.prepareStatement(debit)) {
-						insertStatement.setString(1, transferId);
-						insertStatement.setString(2, sourceUuid);
-						insertStatement.setString(3, sourcePointsColumn);
-						insertStatement.setString(4, targetUuid);
-						insertStatement.setInt(5, debitPoints);
-						insertStatement.setInt(6, requestedCreditPoints);
-						insertStatement.setString(7, RESERVED);
-						insertStatement.setLong(8, now);
-					insertStatement.executeUpdate();
+		String insert = "INSERT INTO " + qiJournal() + " (" + qi("transfer_id") + ", " + qi("source_uuid")
+				+ ", " + qi("source_points_column") + ", " + qi("target_uuid") + ", " + qi("debit_points")
+				+ ", " + qi("requested_credit_points") + ", " + qi("state") + ", " + qi("created_at")
+				+ ") VALUES (?, ?, ?, ?, ?, ?, ?, ?)";
+		String points = qi(sourcePointsColumn);
+		String debit = "UPDATE " + qi(table.getTableName()) + " SET " + points + " = " + points
+				+ " - ? WHERE " + qi("uuid") + uuidCast() + " AND " + points + " >= ?";
+		try (Connection connection = connection()) {
+			connection.setAutoCommit(false);
+			try (PreparedStatement insertStatement = connection.prepareStatement(insert);
+					PreparedStatement debitStatement = connection.prepareStatement(debit)) {
+					insertStatement.setString(1, transferId);
+					insertStatement.setString(2, sourceUuid);
+					insertStatement.setString(3, sourcePointsColumn);
+					insertStatement.setString(4, targetUuid);
+					insertStatement.setInt(5, debitPoints);
+					insertStatement.setInt(6, requestedCreditPoints);
+					insertStatement.setString(7, RESERVED);
+					insertStatement.setLong(8, now);
+				insertStatement.executeUpdate();
 
-					debitStatement.setInt(1, debitPoints);
-					debitStatement.setString(2, sourceUuid);
-					debitStatement.setInt(3, debitPoints);
-					pointWriteAttempted = true;
-					if (debitStatement.executeUpdate() != 1) {
-						connection.rollback();
-						return false;
-					}
-					return commitAndConfirm(connection, transferId, RESERVED);
-				} catch (SQLException failure) {
-					rollback(connection);
-					if (isDuplicate(failure)) {
-						closeQuietly(connection);
-						TransferRow duplicate = find(transferId);
-						return duplicate != null && duplicate.matches(sourceUuid, targetUuid, debitPoints,
-								requestedCreditPoints) && !REFUNDED.equals(duplicate.state);
-					}
-					throw failure;
+				debitStatement.setInt(1, debitPoints);
+				debitStatement.setString(2, sourceUuid);
+				debitStatement.setInt(3, debitPoints);
+				if (debitStatement.executeUpdate() != 1) {
+					connection.rollback();
+					return false;
 				}
+				return commitAndConfirm(connection, transferId, RESERVED);
+			} catch (SQLException failure) {
+				rollback(connection);
+				if (isDuplicate(failure)) {
+					closeQuietly(connection);
+					TransferRow duplicate = find(transferId);
+					return duplicate != null && duplicate.matches(sourceUuid, targetUuid, debitPoints,
+							requestedCreditPoints) && !REFUNDED.equals(duplicate.state);
+				}
+				throw failure;
 			}
-		} catch (SQLException failure) {
-			if (failure instanceof PreparationFailure) throw failure;
-			if (!pointWriteAttempted) throw new PreparationFailure(failure);
-			throw failure;
 		}
 	}
 
@@ -302,50 +286,42 @@ final class SharedPointTransferJournal {
 	 */
 	boolean refundReserved(String transferId, String sourceUuid, String sourcePointsColumn, int debitPoints)
 			throws SQLException {
-		boolean pointWriteAttempted = false;
-		try {
-			if (!isSafeColumn(sourcePointsColumn)) return false;
-			String select = "SELECT " + qi("state") + " FROM " + qiJournal() + " WHERE " + qi("transfer_id")
-					+ " = ? FOR UPDATE";
-			String points = qi(sourcePointsColumn);
-			String refund = "UPDATE " + qi(table.getTableName()) + " SET " + points + " = " + points
-					+ " + ? WHERE " + qi("uuid") + uuidCast();
-			String update = "UPDATE " + qiJournal() + " SET " + qi("state") + " = ? WHERE " + qi("transfer_id")
-					+ " = ?";
-			try (Connection connection = connection()) {
-				connection.setAutoCommit(false);
-				try (PreparedStatement selectStatement = connection.prepareStatement(select)) {
-					selectStatement.setString(1, transferId);
-					try (ResultSet result = selectStatement.executeQuery()) {
-						if (!result.next() || !RESERVED.equals(result.getString(1))) {
-							connection.rollback();
-							return false;
-						}
-					}
-				}
-				try (PreparedStatement refundStatement = connection.prepareStatement(refund)) {
-					refundStatement.setInt(1, debitPoints);
-					refundStatement.setString(2, sourceUuid);
-					pointWriteAttempted = true;
-					if (refundStatement.executeUpdate() != 1) {
+		if (!isSafeColumn(sourcePointsColumn)) return false;
+		String select = "SELECT " + qi("state") + " FROM " + qiJournal() + " WHERE " + qi("transfer_id")
+				+ " = ? FOR UPDATE";
+		String points = qi(sourcePointsColumn);
+		String refund = "UPDATE " + qi(table.getTableName()) + " SET " + points + " = " + points
+				+ " + ? WHERE " + qi("uuid") + uuidCast();
+		String update = "UPDATE " + qiJournal() + " SET " + qi("state") + " = ? WHERE " + qi("transfer_id")
+				+ " = ?";
+		try (Connection connection = connection()) {
+			connection.setAutoCommit(false);
+			try (PreparedStatement selectStatement = connection.prepareStatement(select)) {
+				selectStatement.setString(1, transferId);
+				try (ResultSet result = selectStatement.executeQuery()) {
+					if (!result.next() || !RESERVED.equals(result.getString(1))) {
 						connection.rollback();
 						return false;
 					}
 				}
-				try (PreparedStatement updateStatement = connection.prepareStatement(update)) {
-					updateStatement.setString(1, REFUNDED);
-					updateStatement.setString(2, transferId);
-					if (updateStatement.executeUpdate() != 1) {
-						connection.rollback();
-						return false;
-					}
-				}
-				return commitAndConfirm(connection, transferId, REFUNDED);
 			}
-		} catch (SQLException failure) {
-			if (failure instanceof PreparationFailure) throw failure;
-			if (!pointWriteAttempted) throw new PreparationFailure(failure);
-			throw failure;
+			try (PreparedStatement refundStatement = connection.prepareStatement(refund)) {
+				refundStatement.setInt(1, debitPoints);
+				refundStatement.setString(2, sourceUuid);
+				if (refundStatement.executeUpdate() != 1) {
+					connection.rollback();
+					return false;
+				}
+			}
+			try (PreparedStatement updateStatement = connection.prepareStatement(update)) {
+				updateStatement.setString(1, REFUNDED);
+				updateStatement.setString(2, transferId);
+				if (updateStatement.executeUpdate() != 1) {
+					connection.rollback();
+					return false;
+				}
+			}
+			return commitAndConfirm(connection, transferId, REFUNDED);
 		}
 	}
 
@@ -364,7 +340,6 @@ final class SharedPointTransferJournal {
 				+ " + ? WHERE " + qi("uuid") + uuidCast();
 		String update = "UPDATE " + qiJournal() + " SET " + qi("state") + " = ? WHERE " + qi("transfer_id")
 				+ " = ?";
-		boolean pointWriteAttempted = false;
 		try (Connection connection = connection()) {
 			connection.setAutoCommit(false);
 			try (PreparedStatement selectStatement = connection.prepareStatement(select)) {
@@ -388,7 +363,6 @@ final class SharedPointTransferJournal {
 			try (PreparedStatement refundStatement = connection.prepareStatement(refund)) {
 				refundStatement.setInt(1, debitPoints);
 				refundStatement.setString(2, sourceUuid);
-				pointWriteAttempted = true;
 				if (refundStatement.executeUpdate() != 1) {
 					connection.rollback();
 					return false;
@@ -404,7 +378,6 @@ final class SharedPointTransferJournal {
 			}
 			return commitAndConfirm(connection, transferId, REFUNDED);
 		} catch (SQLException failure) {
-			if (!pointWriteAttempted) throw new PreparationFailure(failure);
 			throw failure;
 		}
 	}

VotingPlugin/src/main/java/com/bencodez/votingplugin/user/UserManager.java

@@ -2,11 +2,7 @@ package com.bencodez.votingplugin.user;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.UUID;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.bencodez.votingplugin.placeholders.PlaceholderPlayerPresence.LiveIdentity;
+import java.util.UUID;
 
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -26,8 +22,7 @@ import com.bencodez.votingplugin.topvoter.TopVoter;
  * Manages VotingPlugin user operations and data.
  */
 public class UserManager {
-	private VotingPluginMain plugin;
-	private final Set<UUID> warnedOfflineUuidPlayers = ConcurrentHashMap.newKeySet();
+	private VotingPluginMain plugin;
 	private boolean sharedPointTransferRecoveryScheduled;
 
 	/**
@@ -262,50 +257,18 @@ public class UserManager {
 	 * Gets a VotingPluginUser by UUID.
 	 * @param uuid the player UUID
 	 * @return the VotingPluginUser
-	 * @deprecated UUID-only lookups can be ambiguous in offline mode because Minecraft
-	 *             preserves name capitalization, while VotingPlugin derives its
-	 *             offline UUID from the player name lowercased with Locale.ROOT.
-	 *             Prefer {@link #getVotingPluginUser(UUID, String)} when both UUID
-	 *             and player name are available; supplying the name allows the
-	 *             existing offline UUID normalization. Use
-	 *             {@link #getVotingPluginUser(Player)} for an online player,
-	 *             {@link #getVotingPluginUser(OfflinePlayer)} when an offline
-	 *             player object with a known name is available, or
-	 *             {@link #getVotingPluginUser(String)} when only the name is known.
 	 */
-	@Deprecated
 	@SuppressWarnings("deprecation")
 	public VotingPluginUser getVotingPluginUser(UUID uuid) {
-		LiveIdentity identity = offlineLiveIdentity(uuid);
-		if (identity == null) return new VotingPluginUser(plugin, uuid);
-		VotingPluginUser user = new VotingPluginUser(plugin, identity.storageUuid(), false);
-		user.setPlayerName(identity.playerName());
-		warnOfflineUuidCorrection(uuid, identity);
-		return user;
+		return new VotingPluginUser(plugin, uuid);
 	}
 
 	/**
-	 * Gets a VotingPluginUser by exact storage UUID with optional name loading.
-	 * This overload preserves the supplied key for storage iteration, recovery
-	 * and administrative operations, even when loadName is true.
+	 * Gets a VotingPluginUser by UUID with optional name loading.
 	 * @param uuid the player UUID
 	 * @param loadName whether to load the player name
 	 * @return the VotingPluginUser
-	 * @deprecated UUID-only lookups can be ambiguous in offline mode because Minecraft
-	 *             preserves name capitalization, while VotingPlugin derives its
-	 *             offline UUID from the player name lowercased with Locale.ROOT.
-	 *             Prefer {@link #getVotingPluginUser(UUID, String)} when both UUID
-	 *             and player name are available; supplying the name allows the
-	 *             existing offline UUID normalization. Use
-	 *             {@link #getVotingPluginUser(Player)} for an online player,
-	 *             {@link #getVotingPluginUser(OfflinePlayer)} when an offline
-	 *             player object with a known name is available, or
-	 *             {@link #getVotingPluginUser(String)} when only the name is known.
-	 *             Retain this overload when the exact stored UUID and explicit
-	 *             name-loading behavior are required; name-aware alternatives
-	 *             may normalize the supplied identity in offline mode.
 	 */
-	@Deprecated
 	@SuppressWarnings("deprecation")
 	public VotingPluginUser getVotingPluginUser(UUID uuid, boolean loadName) {
 		return new VotingPluginUser(plugin, uuid, loadName);
@@ -322,24 +285,6 @@ public class UserManager {
 		return new VotingPluginUser(plugin, uuid, playerName);
 	}
 
-	/** Resolve only immutable live identity captured by the presence lifecycle. */
-	private LiveIdentity offlineLiveIdentity(UUID uuid) {
-		if (plugin.getOptions().isOnlineMode()) return null;
-		var presence = plugin.getPlaceholderPlayerPresence();
-		LiveIdentity identity = presence == null ? null : presence.liveIdentity(uuid);
-		if (identity == null || identity.serverUuid() == null || identity.storageUuid() == null
-				|| identity.playerName() == null || identity.playerName().isBlank()) return null;
-		return identity;
-	}
-
-	private void warnOfflineUuidCorrection(UUID uuid, LiveIdentity identity) {
-		if (!uuid.equals(identity.storageUuid()) && warnedOfflineUuidPlayers.add(identity.storageUuid())) {
-			plugin.getLogger().warning("Offline UUID compatibility workaround used for " + identity.playerName()
-					+ ". Server UUID: " + identity.serverUuid() + " -> VotingPlugin UUID: " + identity.storageUuid()
-					+ ". Applied for third-party compatibility: a plugin may be using the server UUID instead of VotingPlugin's UUID.");
-		}
-	}
-
 	/**
 	 * Purges old players with no voting data.
 	 */

VotingPlugin/src/main/java/com/bencodez/votingplugin/util/BukkitCompletionScheduler.java

@@ -18,19 +18,6 @@ public final class BukkitCompletionScheduler {
 	public static boolean isSuccessfulEntityTaskResult(Object status) {
 		return status instanceof Enum<?> result && "SUCCESS".equals(result.name());
 	}
-
-    /** Event flags are not a reliable execution-context check, including Folia region threads. */
-    public static boolean isPlatformOwnedThread() {
-        try { if (org.bukkit.Bukkit.isPrimaryThread()) return true; } catch (RuntimeException ignored) { }
-        Object server = org.bukkit.Bukkit.getServer();
-        if (server != null) try {
-            if (Boolean.TRUE.equals(server.getClass().getMethod("isGlobalTickThread").invoke(server))) return true;
-        } catch (ReflectiveOperationException | RuntimeException ignored) { }
-        for (String name : new String[] { "ca.spottedleaf.moonrise.common.util.TickThread", "io.papermc.paper.util.TickThread" }) try {
-            if (Boolean.TRUE.equals(Class.forName(name).getMethod("isTickThread").invoke(null))) return true;
-        } catch (ReflectiveOperationException | LinkageError | RuntimeException ignored) { }
-        return false;
-    }
 	private BukkitCompletionScheduler() {
 	}
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/util/ServerDataPublicationFence.java

@@ -1,217 +0,0 @@
-package com.bencodez.votingplugin.util;
-
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Path;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.HexFormat;
-import java.util.Locale;
-import java.util.Properties;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-/** Memory-only admission for participating plugin generations sharing one server-data path in a JVM. */
-public final class ServerDataPublicationFence {
-    private static final String PREFIX = "com.bencodez.votingplugin.ServerDataPublicationFence.owner.";
-    private static final int MAX_OWNERS = 1024;
-    private final Properties registry;
-    private final String key;
-    private final String generation;
-    private final AtomicBoolean retirementStarted = new AtomicBoolean();
-    private final java.util.concurrent.CompletableFuture<Void> retirementCompleted = new java.util.concurrent.CompletableFuture<>();
-
-    private final CompletableFuture<Long> processShutdownStarted = new CompletableFuture<>();
-    private final CompletableFuture<Void> processExitCompletion = new CompletableFuture<>();
-    private final AtomicBoolean processHookRemoved = new AtomicBoolean();
-    private volatile Runtime processRuntime;
-    private volatile Thread processHook;
-
-    /** Opt in during startup, before the JVM can begin invoking shutdown hooks. */
-    public synchronized void retainForProcessExit() {
-        if (processHook != null) return;
-        var runtime = Runtime.getRuntime();
-        var hook = new Thread(this::awaitProcessExit, "VotingPlugin-ServerData-Exit");
-        runtime.addShutdownHook(hook);
-        processRuntime = runtime;
-        processHook = hook;
-        processExitCompletion.whenComplete((ignored, failure) -> removeProcessHook());
-    }
-
-    /** The first disable entry fixes the deadline; retries cannot renew it. No caller wait. */
-    public void beginShutdown(long startedNanos) {
-        if (processShutdownStarted.complete(startedNanos) && processHook != null) {
-            CompletableFuture.delayedExecutor(remainingProcessWait(startedNanos), TimeUnit.NANOSECONDS)
-                    .execute(this::removeProcessHook);
-        }
-    }
-
-    private static long remainingProcessWait(long startedNanos) {
-        long elapsed = Math.max(0L, System.nanoTime() - startedNanos);
-        return Math.max(0L, TimeUnit.SECONDS.toNanos(15) - elapsed);
-    }
-
-    private void awaitProcessExit() {
-        long exitStarted = System.nanoTime();
-        try {
-            long disableStarted = processShutdownStarted.get(remainingProcessWait(exitStarted), TimeUnit.NANOSECONDS);
-            long remaining = Math.min(remainingProcessWait(exitStarted), remainingProcessWait(disableStarted));
-            if (remaining > 0) processExitCompletion.get(remaining, TimeUnit.NANOSECONDS);
-        } catch (InterruptedException interrupted) {
-            Thread.currentThread().interrupt();
-        } catch (ExecutionException | TimeoutException pendingOrExpired) {
-            // Process exit is bounded. Timeout does not acknowledge publication or release a lease.
-        }
-    }
-
-    private void removeProcessHook() {
-        var hook = processHook;
-        if (hook == null || !processHookRemoved.compareAndSet(false, true)) return;
-        try { processRuntime.removeShutdownHook(hook); }
-        catch (IllegalStateException stopping) { /* The JVM is already invoking its hooks. */ }
-    }
-
-    private ServerDataPublicationFence(Properties registry, String key, String generation) {
-        this.registry = registry;
-        this.key = key;
-        this.generation = generation;
-    }
-
-    /** Runs before platform initialization and performs no filesystem operation or wait for storage. */
-    public static ServerDataPublicationFence beginGeneration(Path file) {
-        String identity = file.toAbsolutePath().normalize().toString();
-        if (DurableFiles.isWindowsName(System.getProperty("os.name", ""))) identity = identity.toLowerCase(Locale.ROOT);
-        String key;
-        try {
-            key = PREFIX + HexFormat.of().formatHex(MessageDigest.getInstance("SHA-256")
-                    .digest(identity.getBytes(StandardCharsets.UTF_8)));
-        } catch (NoSuchAlgorithmException unavailable) { throw new IllegalStateException(unavailable); }
-        Properties registry = System.getProperties();
-        synchronized (registry) {
-            Object value = registry.get(key);
-            if (value != null) {
-                State previous = state(value);
-                if (previous.users != 0 || !previous.retiring)
-                    throw new IllegalStateException("Previous server-data generation still owns storage work; replacement was not started");
-            } else if (registry.keySet().stream().filter(k -> k instanceof String s && s.startsWith(PREFIX)).count() >= MAX_OWNERS) {
-                throw new IllegalStateException("Server-data publication owner capacity is unavailable");
-            }
-            String generation = UUID.randomUUID().toString();
-            registry.setProperty(key, generation + ":0:false");
-            return new ServerDataPublicationFence(registry, key, generation);
-        }
-    }
-
-    /** Hold through the entire operation, including a blocked write or admitted shutdown handoff. */
-    public Lease acquire() {
-        synchronized (registry) {
-            State current = current();
-            if (current.users >= MAX_OWNERS) throw new IllegalStateException("Server-data publication admission is unavailable");
-            registry.setProperty(key, generation + ":" + (current.users + 1) + ":" + current.retiring);
-            return new Lease(this);
-        }
-    }
-
-    /** Existing operations/retries retain ownership; a successor requires zero outstanding leases. */
-    public void retire() {
-        boolean drained = false;
-        synchronized (registry) {
-            State current = state(registry.get(key));
-            if (generation.equals(current.generation)) {
-                registry.setProperty(key, generation + ":" + current.users + ":true");
-                drained = current.users == 0;
-            }
-        }
-        // Completion callbacks may remove a JVM hook; never run them under the registry monitor.
-        if (drained) processExitCompletion.complete(null);
-    }
-
-    /** Reserve before asynchronous admission; a failed stage never proves drain. */
-    public void retainUntilSuccessfulPublication(java.util.concurrent.CompletionStage<Void> publication) {
-        java.util.Objects.requireNonNull(publication);
-        Lease lease = acquire();
-        publication.whenComplete((ignored, failure) -> {
-            if (failure == null) lease.close();
-        });
-    }
-
-    /** Reserve before disable and release only after existing SDK writers actually terminate. */
-    public java.util.concurrent.CompletionStage<Void> retainUntilTermination(java.util.concurrent.ScheduledExecutorService[] writers) {
-        var snapshot = writers.clone();
-        if (!retirementStarted.compareAndSet(false, true)) return retirementCompleted.minimalCompletionStage();
-        Lease lease;
-        try { lease = acquire(); }
-        catch (RuntimeException | Error failure) { retirementStarted.set(false); throw failure; }
-        try {
-            Thread guardian = new Thread(() -> {
-                boolean interrupted = false;
-                try (lease) {
-                    for (var writer : snapshot) {
-                        if (writer == null) continue;
-                        while (!writer.isTerminated()) {
-                            try { writer.awaitTermination(100, java.util.concurrent.TimeUnit.MILLISECONDS); }
-                            catch (InterruptedException ignored) { interrupted = true; }
-                        }
-                    }
-                } catch (RuntimeException | Error failure) {
-                    retirementCompleted.completeExceptionally(failure);
-                    return;
-                } finally { if (interrupted) Thread.currentThread().interrupt(); }
-                retirementCompleted.complete(null);
-            }, "VotingPlugin-server-data-retirement");
-            guardian.setDaemon(true);
-            guardian.start();
-        } catch (RuntimeException | Error failure) {
-            try { lease.close(); }
-            catch (RuntimeException | Error cleanupFailure) { if (cleanupFailure != failure) failure.addSuppressed(cleanupFailure); }
-            finally { retirementStarted.set(false); }
-            throw failure;
-        }
-        return retirementCompleted.minimalCompletionStage();
-    }
-
-    private State current() {
-        State current = state(registry.get(key));
-        if (registry != System.getProperties() || !generation.equals(current.generation))
-            throw new IllegalStateException("Server-data publication belongs to another generation");
-        return current;
-    }
-
-    private static State state(Object value) {
-        if (!(value instanceof String text) || text.length() > 64)
-            throw new IllegalStateException("Server-data publication ownership is invalid");
-        String[] fields = text.split(":", -1);
-        try {
-            if (fields.length != 3 || !UUID.fromString(fields[0]).toString().equals(fields[0])
-                    || !(fields[2].equals("true") || fields[2].equals("false"))) throw new IllegalArgumentException();
-            int users = Integer.parseInt(fields[1]);
-            if (users < 0 || users > MAX_OWNERS || !Integer.toString(users).equals(fields[1])) throw new IllegalArgumentException();
-            return new State(fields[0], users, Boolean.parseBoolean(fields[2]));
-        } catch (IllegalArgumentException invalid) {
-            throw new IllegalStateException("Server-data publication ownership is invalid");
-        }
-    }
-
-    private record State(String generation, int users, boolean retiring) { }
-
-    public static final class Lease implements AutoCloseable {
-        private final ServerDataPublicationFence owner;
-        private final AtomicBoolean closed = new AtomicBoolean();
-        private Lease(ServerDataPublicationFence owner) { this.owner = owner; }
-        @Override public void close() {
-            boolean drained;
-            synchronized (owner.registry) {
-                if (closed.get()) return;
-                State current = owner.current();
-                if (current.users <= 0) throw new IllegalStateException("Server-data publication ownership is invalid");
-                owner.registry.setProperty(owner.key, owner.generation + ":" + (current.users - 1) + ":" + current.retiring);
-                closed.set(true);
-                drained = current.retiring && current.users == 1;
-            }
-            if (drained) owner.processExitCompletion.complete(null);
-        }
-    }
-}

VotingPlugin/src/main/java/com/bencodez/votingplugin/util/VoteTaskAdmission.java

@@ -13,12 +13,11 @@ public final class VoteTaskAdmission {
 	/**
 	 * Attempts to submit a one-shot vote task without running it on the caller.
 	 *
-	 * @param executor bounded vote executor, or null before startup/after shutdown
+	 * @param executor bounded vote executor
 	 * @param task task to submit
 	 * @return true when the task was admitted
 	 */
 	public static boolean trySubmit(ScheduledExecutorService executor, Runnable task) {
-		if (executor == null) return false;
 		try {
 			executor.submit(task);
 			return true;
@@ -30,14 +29,13 @@ public final class VoteTaskAdmission {
 	/**
 	 * Attempts to schedule a one-shot vote task without blocking the caller.
 	 *
-	 * @param executor bounded vote executor, or null before startup/after shutdown
+	 * @param executor bounded vote executor
 	 * @param task task to schedule
 	 * @param delay delay before execution
 	 * @param unit delay unit
 	 * @return true when the task was admitted
 	 */
 	public static boolean trySchedule(ScheduledExecutorService executor, Runnable task, long delay, TimeUnit unit) {
-		if (executor == null) return false;
 		try {
 			executor.schedule(task, delay, unit);
 			return true;

VotingPlugin/src/main/java/com/bencodez/votingplugin/voteshop/service/SharedMysqlPurchaseJournal.java

@@ -29,14 +29,6 @@ import com.bencodez.simpleapi.sql.mysql.DbType;
  * arbitrary, non-idempotent side effects.</p>
  */
 final class SharedMysqlPurchaseJournal {
-	/** Positive proof that this invocation did not attempt a points write. */
-	static final class PreparationFailure extends SQLException {
-		private static final long serialVersionUID = 1L;
-		PreparationFailure(SQLException cause) {
-			super(cause.getMessage(), cause.getSQLState(), cause.getErrorCode(), cause);
-		}
-	}
-
 	private static final String PENDING = "PENDING";
 	private static final String HOOK_STARTED = "HOOK_STARTED";
 	private static final String COMPENSATING = "COMPENSATING";
@@ -127,68 +119,60 @@ final class SharedMysqlPurchaseJournal {
 	/** Atomically records a pending purchase and conditionally charges it. */
 	boolean reserve(String purchaseId, String uuid, String pointsColumn, String limitColumn, int cost, int limit,
 			String limitGeneration, long limitGenerationExpiresAt, long now) throws SQLException {
-		boolean pointWriteAttempted = false;
-		try {
-			String insert = "INSERT INTO " + qiJournal() + " (" + qi("purchase_id") + ", " + qi("player_uuid")
-					+ ", " + qi("points_column") + ", " + qi("limit_column") + ", " + qi("cost") + ", "
-					+ qi("limit_value") + ", " + qi("limit_generation") + ", "
-					+ qi("limit_generation_expires_at") + ", " + qi("limit_epoch") + ", " + qi("state")
-					+ ", " + qi("created_at") + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
-			String points = qi(pointsColumn);
-			StringBuilder debit = new StringBuilder("UPDATE ").append(qi(table.getTableName())).append(" SET ")
-					.append(points).append(" = COALESCE(").append(points).append(", 0) - ?");
-			if (limitColumn != null) {
-				debit.append(", ").append(qi(limitColumn)).append(" = COALESCE(").append(qi(limitColumn))
-						.append(", 0) + 1");
-			}
-			debit.append(" WHERE ").append(qi("uuid")).append(uuidCast()).append(" AND COALESCE(").append(points)
-					.append(", 0) >= ?");
-			if (limitColumn != null) {
-				debit.append(" AND COALESCE(").append(qi(limitColumn)).append(", 0) < ?");
-			}
-			try (Connection connection = connection()) {
-				connection.setAutoCommit(false);
-				try {
-					Long limitEpoch = limitColumn == null ? null : lockLimitEpoch(connection, limitColumn);
-					try (PreparedStatement insertStatement = connection.prepareStatement(insert);
-							PreparedStatement debitStatement = connection.prepareStatement(debit.toString())) {
-						insertStatement.setString(1, purchaseId);
-						insertStatement.setString(2, uuid);
-						insertStatement.setString(3, pointsColumn);
-						insertStatement.setString(4, limitColumn);
-						insertStatement.setInt(5, cost);
-						if (limitColumn == null) insertStatement.setNull(6, java.sql.Types.INTEGER);
-						else insertStatement.setInt(6, limit);
-						if (limitGeneration == null) insertStatement.setNull(7, java.sql.Types.VARCHAR);
-						else insertStatement.setString(7, limitGeneration);
-						if (limitGenerationExpiresAt <= 0L) insertStatement.setNull(8, java.sql.Types.BIGINT);
-						else insertStatement.setLong(8, limitGenerationExpiresAt);
-						if (limitEpoch == null) insertStatement.setNull(9, java.sql.Types.BIGINT);
-						else insertStatement.setLong(9, limitEpoch.longValue());
-						insertStatement.setString(10, PENDING);
-						insertStatement.setLong(11, now);
-						insertStatement.executeUpdate();
+		String insert = "INSERT INTO " + qiJournal() + " (" + qi("purchase_id") + ", " + qi("player_uuid")
+				+ ", " + qi("points_column") + ", " + qi("limit_column") + ", " + qi("cost") + ", "
+				+ qi("limit_value") + ", " + qi("limit_generation") + ", "
+				+ qi("limit_generation_expires_at") + ", " + qi("limit_epoch") + ", " + qi("state")
+				+ ", " + qi("created_at") + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+		String points = qi(pointsColumn);
+		StringBuilder debit = new StringBuilder("UPDATE ").append(qi(table.getTableName())).append(" SET ")
+				.append(points).append(" = COALESCE(").append(points).append(", 0) - ?");
+		if (limitColumn != null) {
+			debit.append(", ").append(qi(limitColumn)).append(" = COALESCE(").append(qi(limitColumn))
+					.append(", 0) + 1");
+		}
+		debit.append(" WHERE ").append(qi("uuid")).append(uuidCast()).append(" AND COALESCE(").append(points)
+				.append(", 0) >= ?");
+		if (limitColumn != null) {
+			debit.append(" AND COALESCE(").append(qi(limitColumn)).append(", 0) < ?");
+		}
+		try (Connection connection = connection()) {
+			connection.setAutoCommit(false);
+			try {
+				Long limitEpoch = limitColumn == null ? null : lockLimitEpoch(connection, limitColumn);
+				try (PreparedStatement insertStatement = connection.prepareStatement(insert);
+						PreparedStatement debitStatement = connection.prepareStatement(debit.toString())) {
+					insertStatement.setString(1, purchaseId);
+					insertStatement.setString(2, uuid);
+					insertStatement.setString(3, pointsColumn);
+					insertStatement.setString(4, limitColumn);
+					insertStatement.setInt(5, cost);
+					if (limitColumn == null) insertStatement.setNull(6, java.sql.Types.INTEGER);
+					else insertStatement.setInt(6, limit);
+					if (limitGeneration == null) insertStatement.setNull(7, java.sql.Types.VARCHAR);
+					else insertStatement.setString(7, limitGeneration);
+					if (limitGenerationExpiresAt <= 0L) insertStatement.setNull(8, java.sql.Types.BIGINT);
+					else insertStatement.setLong(8, limitGenerationExpiresAt);
+					if (limitEpoch == null) insertStatement.setNull(9, java.sql.Types.BIGINT);
+					else insertStatement.setLong(9, limitEpoch.longValue());
+					insertStatement.setString(10, PENDING);
+					insertStatement.setLong(11, now);
+					insertStatement.executeUpdate();
 
-						debitStatement.setInt(1, cost);
-						debitStatement.setString(2, uuid);
-						debitStatement.setInt(3, cost);
-						if (limitColumn != null) debitStatement.setInt(4, limit);
-						pointWriteAttempted = true;
-						if (debitStatement.executeUpdate() != 1) {
-							rollback(connection);
-							return false;
-						}
-						return commitAndConfirm(connection, purchaseId, PENDING);
+					debitStatement.setInt(1, cost);
+					debitStatement.setString(2, uuid);
+					debitStatement.setInt(3, cost);
+					if (limitColumn != null) debitStatement.setInt(4, limit);
+					if (debitStatement.executeUpdate() != 1) {
+						rollback(connection);
+						return false;
 					}
-				} catch (SQLException failure) {
-					rollback(connection);
-					throw failure;
+					return commitAndConfirm(connection, purchaseId, PENDING);
 				}
+			} catch (SQLException failure) {
+				rollback(connection);
+				throw failure;
 			}
-		} catch (SQLException failure) {
-			if (failure instanceof PreparationFailure) throw failure;
-			if (!pointWriteAttempted) throw new PreparationFailure(failure);
-			throw failure;
 		}
 	}
 
@@ -386,73 +370,65 @@ final class SharedMysqlPurchaseJournal {
 	private RefundedPurchase setTerminalDetails(String purchaseId, String terminalState, long now,
 			String... refundableStates)
 			throws SQLException {
-		boolean pointWriteAttempted = false;
-		try {
-			boolean refund = REFUNDED.equals(terminalState);
-			String refundedUuid = null;
-			String refundedPointsColumn = null;
-			String refundedLimitColumn = null;
-			String select = "SELECT " + qi("state") + ", " + qi("player_uuid") + ", " + qi("points_column")
-					+ ", " + qi("limit_column") + ", " + qi("cost") + ", " + qi("limit_generation") + ", "
-					+ qi("limit_generation_expires_at") + ", " + qi("limit_epoch") + " FROM " + qiJournal() + " WHERE "
-					+ qi("purchase_id") + " = ? FOR UPDATE";
-			try (Connection connection = connection()) {
-				connection.setAutoCommit(false);
-				try (PreparedStatement selectStatement = connection.prepareStatement(select)) {
-					selectStatement.setString(1, purchaseId);
-					try (ResultSet result = selectStatement.executeQuery()) {
-						if (!result.next()) {
-							rollback(connection);
-							return null;
-						}
-						String state = result.getString(1);
-						if (COMPLETED.equals(state) || REFUNDED.equals(state)) {
-							rollback(connection);
-							return terminalState.equals(state) ? new RefundedPurchase(null, null, null) : null;
-						}
-						if (refund && !isRefundableState(state, refundableStates)) {
-							rollback(connection);
-							return null;
-						}
-						if (!refund && !HOOK_STARTED.equals(state)) {
-							rollback(connection);
-							return null;
-						}
-						String uuid = result.getString(2);
-						String pointsColumn = result.getString(3);
-						String limitColumn = result.getString(4);
-						refundedUuid = uuid;
-						refundedPointsColumn = pointsColumn;
-						refundedLimitColumn = limitColumn;
-						int cost = result.getInt(5);
-						String limitGeneration = result.getString(6);
-						Long limitEpoch = nullableLong(result, 8);
-						if (refund) {
-							boolean refundLimit = shouldRefundLimit(connection, limitColumn, limitGeneration, limitEpoch);
-							pointWriteAttempted = true;
-							refund(connection, uuid, pointsColumn, limitColumn, cost, refundLimit);
-						}
-					}
-				}
-				String update = "UPDATE " + qiJournal() + " SET " + qi("state") + " = ? WHERE " + qi("purchase_id")
-						+ " = ?";
-				try (PreparedStatement updateStatement = connection.prepareStatement(update)) {
-					updateStatement.setString(1, terminalState);
-					updateStatement.setString(2, purchaseId);
-					if (updateStatement.executeUpdate() != 1) {
+		boolean refund = REFUNDED.equals(terminalState);
+		String refundedUuid = null;
+		String refundedPointsColumn = null;
+		String refundedLimitColumn = null;
+		String select = "SELECT " + qi("state") + ", " + qi("player_uuid") + ", " + qi("points_column")
+				+ ", " + qi("limit_column") + ", " + qi("cost") + ", " + qi("limit_generation") + ", "
+				+ qi("limit_generation_expires_at") + ", " + qi("limit_epoch") + " FROM " + qiJournal() + " WHERE "
+				+ qi("purchase_id") + " = ? FOR UPDATE";
+		try (Connection connection = connection()) {
+			connection.setAutoCommit(false);
+			try (PreparedStatement selectStatement = connection.prepareStatement(select)) {
+				selectStatement.setString(1, purchaseId);
+				try (ResultSet result = selectStatement.executeQuery()) {
+					if (!result.next()) {
 						rollback(connection);
 						return null;
 					}
+					String state = result.getString(1);
+					if (COMPLETED.equals(state) || REFUNDED.equals(state)) {
+						rollback(connection);
+						return terminalState.equals(state) ? new RefundedPurchase(null, null, null) : null;
+					}
+					if (refund && !isRefundableState(state, refundableStates)) {
+						rollback(connection);
+						return null;
+					}
+					if (!refund && !HOOK_STARTED.equals(state)) {
+						rollback(connection);
+						return null;
+					}
+					String uuid = result.getString(2);
+					String pointsColumn = result.getString(3);
+					String limitColumn = result.getString(4);
+					refundedUuid = uuid;
+					refundedPointsColumn = pointsColumn;
+					refundedLimitColumn = limitColumn;
+					int cost = result.getInt(5);
+					String limitGeneration = result.getString(6);
+					Long limitEpoch = nullableLong(result, 8);
+					if (refund) {
+						refund(connection, uuid, pointsColumn, limitColumn, cost,
+								shouldRefundLimit(connection, limitColumn, limitGeneration, limitEpoch));
+					}
 				}
-				if (!commitAndConfirm(connection, purchaseId, terminalState)) return null;
-				return refund ? new RefundedPurchase(refundedUuid, refundedPointsColumn, refundedLimitColumn)
-						: new RefundedPurchase(null, null, null);
-			} catch (SQLException failure) {
-				throw failure;
 			}
+			String update = "UPDATE " + qiJournal() + " SET " + qi("state") + " = ? WHERE " + qi("purchase_id")
+					+ " = ?";
+			try (PreparedStatement updateStatement = connection.prepareStatement(update)) {
+				updateStatement.setString(1, terminalState);
+				updateStatement.setString(2, purchaseId);
+				if (updateStatement.executeUpdate() != 1) {
+					rollback(connection);
+					return null;
+				}
+			}
+			if (!commitAndConfirm(connection, purchaseId, terminalState)) return null;
+			return refund ? new RefundedPurchase(refundedUuid, refundedPointsColumn, refundedLimitColumn)
+					: new RefundedPurchase(null, null, null);
 		} catch (SQLException failure) {
-			if (failure instanceof PreparationFailure) throw failure;
-			if (!pointWriteAttempted) throw new PreparationFailure(failure);
 			throw failure;
 		}
 	}
@@ -466,28 +442,20 @@ final class SharedMysqlPurchaseJournal {
 
 	private void refund(Connection connection, String uuid, String pointsColumn, String limitColumn, int cost,
 			boolean refundLimit) throws SQLException {
-		boolean pointWriteAttempted = false;
-		try {
-			if (!isSafeColumn(pointsColumn) || (limitColumn != null && !isSafeColumn(limitColumn))) {
-				throw new SQLException("Unsafe durable purchase column");
-			}
-			StringBuilder refund = new StringBuilder("UPDATE ").append(qi(table.getTableName())).append(" SET ")
-					.append(qi(pointsColumn)).append(" = ").append(qi(pointsColumn)).append(" + ?");
-			if (refundLimit) {
-				refund.append(", ").append(qi(limitColumn)).append(" = GREATEST(COALESCE(").append(qi(limitColumn))
-						.append(", 0) - 1, 0)");
-			}
-			refund.append(" WHERE ").append(qi("uuid")).append(uuidCast());
-			try (PreparedStatement statement = connection.prepareStatement(refund.toString())) {
-				statement.setInt(1, cost);
-				statement.setString(2, uuid);
-				pointWriteAttempted = true;
-				if (statement.executeUpdate() != 1) throw new SQLException("Purchase refund player missing");
-			}
-		} catch (SQLException failure) {
-			if (failure instanceof PreparationFailure) throw failure;
-			if (!pointWriteAttempted) throw new PreparationFailure(failure);
-			throw failure;
+		if (!isSafeColumn(pointsColumn) || (limitColumn != null && !isSafeColumn(limitColumn))) {
+			throw new SQLException("Unsafe durable purchase column");
+		}
+		StringBuilder refund = new StringBuilder("UPDATE ").append(qi(table.getTableName())).append(" SET ")
+				.append(qi(pointsColumn)).append(" = ").append(qi(pointsColumn)).append(" + ?");
+		if (refundLimit) {
+			refund.append(", ").append(qi(limitColumn)).append(" = GREATEST(COALESCE(").append(qi(limitColumn))
+					.append(", 0) - 1, 0)");
+		}
+		refund.append(" WHERE ").append(qi("uuid")).append(uuidCast());
+		try (PreparedStatement statement = connection.prepareStatement(refund.toString())) {
+			statement.setInt(1, cost);
+			statement.setString(2, uuid);
+			if (statement.executeUpdate() != 1) throw new SQLException("Purchase refund player missing");
 		}
 	}
 

VotingPlugin/src/main/java/com/bencodez/votingplugin/voteshop/service/VoteShopPurchaseService.java

@@ -186,24 +186,15 @@ public class VoteShopPurchaseService {
 		// or entity task runs could pair an old debit with a newly loaded reward.
 		FileConfiguration shopData = plugin.getShopFile().getData();
 		HashMap<String, String> placeholders = purchasePlaceholders(item);
-		var pointPlaceholders = plugin.getPlaceholders();
-		Consumer<Boolean> admission = pointPlaceholders == null ? null
-				: pointPlaceholders.sharedPointAdmissionCompletion(UUID.fromString(user.getUUID()));
 		try {
 			plugin.getTimer().execute(() -> {
 				try {
 					SharedPurchaseDebit debit;
-					boolean settled = false;
-					try {
-						synchronized (purchaseLock(user.getUUID())) {
-							// Sample the reset window beside the conditional debit. A queued
-							// persistence task may otherwise cross into a new limit period.
-							debit = reserveSharedMysqlPurchase(user, item,
-									limitGeneration(item, System.currentTimeMillis()));
-						}
-						settled = true;
-					} finally {
-						if (admission != null) admission.accept(settled);
+					synchronized (purchaseLock(user.getUUID())) {
+						// Sample the reset window beside the conditional debit. A queued
+						// persistence task may otherwise cross into a new limit period.
+						debit = reserveSharedMysqlPurchase(user, item,
+								limitGeneration(item, System.currentTimeMillis()));
 					}
 					if (debit.result() != VoteShopPurchaseResult.SUCCESS) {
 						completePurchaseResult(player, completion, debit.result());
@@ -216,7 +207,6 @@ public class VoteShopPurchaseService {
 				}
 			});
 		} catch (RuntimeException persistenceRejected) {
-			if (admission != null) admission.accept(false);
 			plugin.debug(persistenceRejected);
 			completeFailedPurchase(player, completion);
 		}
@@ -489,29 +479,20 @@ public class VoteShopPurchaseService {
 	}
 
 	private void refundCompensatingMysqlDebit(VotingPluginUser user, SharedPurchaseDebit debit) {
-		var publication = plugin.getPlaceholders();
-		UUID uuid = publication == null ? null : UUID.fromString(user.getUUID());
-		if (publication != null) publication.beginSharedPointDebit(uuid);
-		boolean known = false;
 		try {
-			debit.journal().refundCompensatingReward(debit.purchaseId());
-			known = true;
+			if (debit.journal().refundCompensatingReward(debit.purchaseId())) {
+				refreshPurchaseCache(user, debit.pointsColumn(), debit.limitColumn());
+			}
 		} catch (SQLException failure) {
-			known = failure instanceof SharedMysqlPurchaseJournal.PreparationFailure;
 			// A commit/confirmation failure is indeterminate: the refund transaction
 			// may have committed even though this worker could not observe its terminal
 			// journal state. Drop the affected snapshots before any later cache dump so
 			// a stale debit cannot overwrite a durable refund. Recovery will reconcile
 			// the journal state if the transaction did not commit.
+			refreshPurchaseCache(user, debit.pointsColumn(), debit.limitColumn());
 			plugin.getLogger().severe("Unable to refund an incomplete vote shop purchase: "
 					+ failure.getClass().getSimpleName());
 			plugin.debug(failure);
-		} finally {
-			try {
-				refreshPurchaseCache(user, debit.pointsColumn(), debit.limitColumn());
-			} finally {
-				if (publication != null) publication.finishSharedPointDebit(uuid, known, false);
-			}
 		}
 	}
 
@@ -757,50 +738,37 @@ public class VoteShopPurchaseService {
 
 	private SharedPurchaseDebit reserveSharedMysqlPurchase(VotingPluginUser user, VoteShopItem item,
 			LimitGeneration limitGeneration) {
-		var publication = plugin.getPlaceholders();
-		UUID pointUuid = UUID.fromString(user.getUUID());
-		if (publication != null) publication.beginSharedPointDebit(pointUuid);
-		boolean known = true;
-		try {
-			MySQL table = plugin.getMysql();
-			String pointsColumn = user.getPointsPath();
-			String limitColumn = item.getLimit() > 0 ? "VoteShopLimit" + item.getIdentifier() : null;
-			ensurePerServerPointsColumn(table, pointsColumn);
-			drainPurchaseCache(user, pointsColumn);
-			if (limitColumn != null) {
-				table.checkColumn(limitColumn, DataType.INTEGER);
-			}
-			try {
-				SharedMysqlPurchaseJournal journal = SharedMysqlPurchaseJournal.forTable(table);
-				String purchaseId = UUID.randomUUID().toString();
-				known = false;
-				boolean reserved = journal.reserve(purchaseId, user.getUUID(), pointsColumn, limitColumn, item.getCost(), item.getLimit(),
-						limitGeneration.value(), limitGeneration.expiresAt(), System.currentTimeMillis());
-				known = true;
-				if (reserved) {
-					// reserve() returns only after its transaction and connection are closed;
-					// NO_CACHE reads must not contend with its one-connection pool handle.
-					refreshPurchaseCache(user, pointsColumn, limitColumn);
-					return new SharedPurchaseDebit(VoteShopPurchaseResult.SUCCESS, journal, purchaseId, pointsColumn,
-							limitColumn);
-				}
-			} catch (SQLException failure) {
-				known |= failure instanceof SharedMysqlPurchaseJournal.PreparationFailure;
-				// reserve() can throw after its commit acknowledgement and confirmation
-				// both fail. The debit may therefore be durable even though this caller
-				// reports FAILED; drop snapshots recreated during that transaction so a
-				// later cache dump cannot restore the pre-reservation values.
-				refreshPurchaseCache(user, pointsColumn, limitColumn);
-				plugin.getLogger().severe("Unable to atomically debit vote shop points: "
-						+ failure.getClass().getSimpleName());
-				plugin.debug(failure);
-				return new SharedPurchaseDebit(VoteShopPurchaseResult.FAILED, null, null, null, null);
-			}
-			refreshPurchaseCache(user, pointsColumn, limitColumn);
-			return new SharedPurchaseDebit(sharedMysqlFailure(user, item, limitColumn), null, null, null, null);
-		} finally {
-			if (publication != null) publication.finishSharedPointDebit(pointUuid, known, false);
+		MySQL table = plugin.getMysql();
+		String pointsColumn = user.getPointsPath();
+		String limitColumn = item.getLimit() > 0 ? "VoteShopLimit" + item.getIdentifier() : null;
+		ensurePerServerPointsColumn(table, pointsColumn);
+		drainPurchaseCache(user, pointsColumn);
+		if (limitColumn != null) {
+			table.checkColumn(limitColumn, DataType.INTEGER);
 		}
+		try {
+			SharedMysqlPurchaseJournal journal = SharedMysqlPurchaseJournal.forTable(table);
+			String purchaseId = UUID.randomUUID().toString();
+			if (journal.reserve(purchaseId, user.getUUID(), pointsColumn, limitColumn, item.getCost(), item.getLimit(),
+					limitGeneration.value(), limitGeneration.expiresAt(), System.currentTimeMillis())) {
+				// reserve() returns only after its transaction and connection are closed;
+				// NO_CACHE reads must not contend with its one-connection pool handle.
+				refreshPurchaseCache(user, pointsColumn, limitColumn);
+				return new SharedPurchaseDebit(VoteShopPurchaseResult.SUCCESS, journal, purchaseId, pointsColumn,
+						limitColumn);
+			}
+		} catch (SQLException failure) {
+			// reserve() can throw after its commit acknowledgement and confirmation
+			// both fail. The debit may therefore be durable even though this caller
+			// reports FAILED; drop snapshots recreated during that transaction so a
+			// later cache dump cannot restore the pre-reservation values.
+			refreshPurchaseCache(user, pointsColumn, limitColumn);
+			plugin.getLogger().severe("Unable to atomically debit vote shop points: "
+					+ failure.getClass().getSimpleName());
+			plugin.debug(failure);
+			return new SharedPurchaseDebit(VoteShopPurchaseResult.FAILED, null, null, null, null);
+		}
+		return new SharedPurchaseDebit(sharedMysqlFailure(user, item, limitColumn), null, null, null, null);
 	}
 
 	/** The legacy cache path created server-suffixed points columns before direct SQL used them. */

VotingPlugin/src/main/resources/Config.yml

@@ -188,7 +188,6 @@ DebugLevel: NONE
 GiveDefaultPermission: true
 
 # If true, plugin will automatically generate votesites upon getting a vote
-# Disable after setup; a small periodic console reminder warns while enabled.
 AutoCreateVoteSites: true
 
 # Geyser/Bedrock player support
@@ -212,14 +211,6 @@ UseVoteGUIMainCommand: false
 # Does not backup MySQL data
 CreateBackups: true
 
-# Player root command and standalone player aliases; admin commands remain available.
-# These settings require a server restart; /av reload does not change registration.
-VoteCommandEnabled: true
-# Root label without a slash or namespace; 1-64 letters, digits, underscores or hyphens.
-# Reserved/invalid names use vote. A foreign bare-name conflict uses votingplugin:<name>.
-# Standalone aliases such as /votegui and /vgui keep their existing names.
-VoteCommandName: vote
-
 # Load command aliases, such as /avgui
 # Requires restart to take effect
 LoadCommandAliases: true
@@ -451,14 +442,6 @@ VoteLogging:
 # Tracks and displays top voters by time period
 ###########################################
 
-# Hide only confirmed never-joined identities from top voter displays.
-# Missing, unreadable or ambiguous history stays visible. Awards are unchanged.
-# Presence checks are asynchronous; pending snapshots stay visible until refreshed.
-# Evidence expires after 30 seconds. GUI, chat and placeholder views can show
-# previously hidden rows while fresh checks are pending; stale negatives are not reused.
-# At most 128 checks run at once, so a large expired board may need several refreshes.
-HideTopVoterIfNotPlayedBefore: false
-
 # Top voter blacklist
 # Hide these names from top voter lists
 BlackList:
@@ -1273,3 +1256,9 @@ DisableUpdateChecking: false
 # Disable checking permissions on tab complete
 # Could increase performance slightly, but probably not
 DisableAdvancedTab: false
+
+# Optional public vanilla villagers opening the existing voting-site menu.
+# Enable and /av reload, then /av npc create <id> [name]. No Citizens required.
+# Definitions live in VotingNPCs.json; disabling keeps them but removes live NPCs.
+VotingNPCs:
+  Enabled: false

VotingPlugin/src/main/resources/GUI.yml

@@ -294,10 +294,6 @@ CHEST:
         Lore: '&c&lBest: &c%Best%'
         Amount: 1
 
-  # Separate read-only /vote streaks progression menu.
-  VoteStreaks:
-    Name: '&6Vote streaks'
-
   VoteStreak:
     Name: 'VoteStreak: %player%'
     BackButton: false

VotingPlugin/src/main/resources/SpecialRewards.yml

@@ -397,45 +397,3 @@ DailyAwards:
     Rewards:
       Messages:
         Player: '&aYou came in second place in %TopVoter%!'
-
-# Owner-defined dated events. This example is DISABLED by default.
-# Set your own dates/rewards, then enable the event. No automatic recurring reset.
-# Keep the event ID stable to retain progress; never delete its ledger and reuse it.
-# After accounting starts, use a NEW ID for changes to dates, timezone, thresholds,
-# VoteSites or AccountingServer. Unsafe edits are rejected, preserving progress.
-# DisplayName and Enabled may change without resetting counts.
-# Full configuration and durability limits: docs/date-vote-milestones.md
-DateVoteMilestones:
-  example_event:
-    Enabled: false
-    # Count admin/test votes for this event? Existing normal vote policies are unchanged.
-    CountFakeVotes: true
-    DisplayName: 'Example voting event'
-    # Local ISO date-times interpreted in the explicit IANA timezone below.
-    Start: '2026-10-01T00:00:00' # Inclusive: occurrences at this instant count.
-    End: '2026-11-01T00:00:00' # Exclusive: occurrences at this instant do not count.
-    Timezone: 'UTC'
-    # Ledger owner: empty/omitted means local accounting on standalone servers.
-    # With UseBungeecord enabled, empty/omitted disables new date accounting.
-    # Proxy: set the exact, case-sensitive BungeeSettings.yml Server name of ONE
-    # backend, identically on every backend, with identified all-server delivery.
-    # Reward delivery follows the existing reward settings. Keep matching event
-    # IDs and milestone reward sections on backends that may resolve rewards.
-    AccountingServer: ''
-    # Configured VoteSites.yml keys (not service names); empty means all sites.
-    VoteSites: []
-    # Named milestones use At (one count, list, or bounded range) / Every.
-    # Existing numeric keys with Rewards remain supported; see the guide.
-    Milestones:
-      TenVotes:
-        Enabled: true
-        At: 10
-        Rewards:
-          Messages:
-            Player: '&aYou reached 10 votes in %DateVoteEvent%!'
-      TwentyFiveVotes:
-        Enabled: true
-        At: 25
-        Rewards:
-          Messages:
-            Player: '&aYou reached 25 votes in %DateVoteEvent%!'

VotingPlugin/src/main/resources/plugin.yml

@@ -170,6 +170,8 @@ permissions:
     description: Allows mod commands
   VotingPlugin.Admin:
     description: Allows admincommands
+    children:
+      VotingPlugin.Commands.AdminVote: true
   VotingPlugin.TopVoter.Ignore:
     description: Allows you to be exempt from top voter
   VotingPlugin.NoRemind:
@@ -196,11 +198,8 @@ permissions:
     description: Remind if player can vote on all votesites, rather than any
     default: false
 
-  VotingPlugin.Commands.Vote.DateEvents:
-    description: View owner-configured date event progress
-    default: false
-  VotingPlugin.Commands.Vote.Streaks:
-    description: View your read-only vote streak progression
+  VotingPlugin.Commands.AdminVote.NPC:
+    description: Create, inspect, list and remove saved vanilla voting NPCs
     default: op
     children:
-      VotingPlugin.Commands.Vote: true
+      VotingPlugin.Commands.AdminVote: true

VotingPlugin/src/test/java/com/bencodez/votingplugin/VotingPluginHooksReplayCompletionTest.java

@@ -1,7 +1,4 @@
-package com.bencodez.votingplugin.tests;
-
-import com.bencodez.votingplugin.VotingPluginHooks;
-import com.bencodez.votingplugin.VotingPluginMain;
+package com.bencodez.votingplugin;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;

VotingPlugin/src/test/java/com/bencodez/votingplugin/VotingPluginMainBackendProxyPublicationTest.java

@@ -1,8 +1,4 @@
-package com.bencodez.votingplugin.tests;
-
-import com.bencodez.votingplugin.tests.support.ReflectiveAccess;
-
-import com.bencodez.votingplugin.VotingPluginMain;
+package com.bencodez.votingplugin;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -48,7 +44,7 @@ class VotingPluginMainBackendProxyPublicationTest {
 		setField(plugin, "bungeeSettings", settings);
 		when(settings.isUseBungeecoord()).thenReturn(true);
 
-		VotingPluginMainAccess.reloadBackendProxyRuntime(plugin, true, false);
+		plugin.reloadBackendProxyRuntime(true, false);
 
 		verify(active).reloadSharedTransportSecurity();
 		verify(active).reloadPresenceReporting();
@@ -67,7 +63,7 @@ class VotingPluginMainBackendProxyPublicationTest {
 
 		// Full-editor Control preparation reloads settings before this replacement
 		// can be validated or published. It must not reconfigure the live handler.
-		VotingPluginMainAccess.reloadBackendProxyRuntime(plugin, false, false);
+		plugin.reloadBackendProxyRuntime(false, false);
 		VotingPluginMain.BackendProxyRestart restart = restart(previous, replacement);
 		assertThrows(IllegalStateException.class, () -> plugin.completeBackendProxyHandlerRestart(restart));
 
@@ -83,7 +79,7 @@ class VotingPluginMainBackendProxyPublicationTest {
 		setField(plugin, "bungeeSettings", settings);
 		when(settings.isUseBungeecoord()).thenReturn(true);
 
-		VotingPluginMainAccess.reloadBackendProxyRuntime(plugin, false, false);
+		plugin.reloadBackendProxyRuntime(false, false);
 
 		assertNull(plugin.getBackendProxyHandler());
 	}
@@ -100,7 +96,7 @@ class VotingPluginMainBackendProxyPublicationTest {
 		Method load = VotingPluginMain.class.getDeclaredMethod("loadBungeeHandler");
 		load.setAccessible(true);
 
-		assertDoesNotThrow(() -> ReflectiveAccess.invoke(load, plugin, new Object[]{}));
+		assertDoesNotThrow(() -> load.invoke(plugin));
 		assertNull(plugin.getBackendProxyHandler());
 	}
 
@@ -161,7 +157,7 @@ class VotingPluginMainBackendProxyPublicationTest {
 			return null;
 		}).when(replacement).activatePresenceReporting();
 
-		VotingPluginMainAccess.publishBackendProxyHandler(plugin, null, replacement);
+		plugin.publishBackendProxyHandler(null, replacement);
 
 		assertSame(replacement, plugin.getBackendProxyHandler());
 	}
@@ -175,7 +171,7 @@ class VotingPluginMainBackendProxyPublicationTest {
 				.when(replacement).activatePresenceReporting();
 
 		org.junit.jupiter.api.Assertions.assertThrows(IllegalStateException.class,
-				() -> VotingPluginMainAccess.publishBackendProxyHandler(plugin, previous, replacement));
+				() -> plugin.publishBackendProxyHandler(previous, replacement));
 
 		assertSame(previous, plugin.getBackendProxyHandler());
 		verify(replacement).abortStagedInboundTo(previous);
@@ -272,7 +268,7 @@ class VotingPluginMainBackendProxyPublicationTest {
 				org.mockito.ArgumentMatchers.anyLong());
 		verify(previous, never()).close();
 
-		VotingPluginMainAccess.closePublishedPreviousBackendProxyHandler(plugin, previous, "after publication");
+		plugin.closePublishedPreviousBackendProxyHandler(previous, "after publication");
 		assertTrue(closed.await(1, TimeUnit.SECONDS));
 		assertTrue(closeThread.get().startsWith("VotingPlugin-Retired-Backend"));
 	}
@@ -336,7 +332,7 @@ class VotingPluginMainBackendProxyPublicationTest {
 
 		try {
 			org.junit.jupiter.api.Assertions.assertTimeoutPreemptively(java.time.Duration.ofMillis(250),
-					() -> VotingPluginMainAccess.closePublishedPreviousBackendProxyHandler(plugin, previous, "after publication"));
+					() -> plugin.closePublishedPreviousBackendProxyHandler(previous, "after publication"));
 			assertTrue(closeStarted.await(1, TimeUnit.SECONDS));
 			assertTrue(closeThread.get().startsWith("VotingPlugin-Retired-Backend"));
 		} finally {
@@ -709,7 +705,7 @@ class VotingPluginMainBackendProxyPublicationTest {
 		Constructor<VotingPluginMain.BackendProxyRestart> constructor = VotingPluginMain.BackendProxyRestart.class
 				.getDeclaredConstructor(BackendProxyHandler.class, BackendProxyHandler.class, boolean.class, boolean.class);
 		constructor.setAccessible(true);
-		return ReflectiveAccess.newInstance(constructor, new Object[]{previous, replacement, replacement == null, previousRequiresPreparation});
+		return constructor.newInstance(previous, replacement, replacement == null, previousRequiresPreparation);
 	}
 
 	private void setBackendProxyHandler(VotingPluginMain plugin, BackendProxyHandler handler) throws Exception {
@@ -719,13 +715,13 @@ class VotingPluginMainBackendProxyPublicationTest {
 	private void setField(VotingPluginMain plugin, String name, Object value) throws Exception {
 		Field field = VotingPluginMain.class.getDeclaredField(name);
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, plugin, value);
+		field.set(plugin, value);
 	}
 
 	private void setRestartField(VotingPluginMain.BackendProxyRestart restart, String name, Object value)
 			throws Exception {
 		Field field = VotingPluginMain.BackendProxyRestart.class.getDeclaredField(name);
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, restart, value);
+		field.set(restart, value);
 	}
 }

VotingPlugin/src/test/java/com/bencodez/votingplugin/VotingPluginMainPlaceholderPresenceTest.java

@@ -1,6 +1,4 @@
-package com.bencodez.votingplugin.tests;
-
-import com.bencodez.votingplugin.VotingPluginMain;
+package com.bencodez.votingplugin;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.Mockito.*;
@@ -147,18 +145,18 @@ class VotingPluginMainPlaceholderPresenceTest {
 		verify(plugin, times(2)).captureOnlineTopVoterIgnore(any(), any());
 	}
 	@Test
-	void offlineStorageIdentityWinsDuringColdPresenceRefresh() {
+	void cachedStorageIdentityWinsDuringColdPresenceRefresh() {
 		Player player = mock(Player.class);
 		UuidLookup lookup = mock(UuidLookup.class);
 		UUID bukkitUuid = UUID.randomUUID();
 		UUID storageUuid = UUID.randomUUID();
 		when(player.getName()).thenReturn("Player");
 		when(player.getUniqueId()).thenReturn(bukkitUuid);
-		when(lookup.getUUIDWithoutStorage("Player")).thenReturn(storageUuid.toString());
+		when(lookup.getCachedUUID("Player")).thenReturn(storageUuid.toString());
 
 		try (var uuidLookup = mockStatic(UuidLookup.class)) {
 			uuidLookup.when(UuidLookup::getInstance).thenReturn(lookup);
-			assertEquals(storageUuid, VotingPluginMainAccess.placeholderStorageUuid(player, false));
+			assertEquals(storageUuid, VotingPluginMain.placeholderStorageUuid(player, false));
 		}
 	}
 
@@ -169,11 +167,11 @@ class VotingPluginMainPlaceholderPresenceTest {
 		UUID bukkitUuid = UUID.randomUUID();
 		when(player.getName()).thenReturn("Player");
 		when(player.getUniqueId()).thenReturn(bukkitUuid);
-		when(lookup.getUUIDWithoutStorage("Player")).thenReturn("");
+		when(lookup.getCachedUUID("Player")).thenReturn("");
 
 		try (var uuidLookup = mockStatic(UuidLookup.class)) {
 			uuidLookup.when(UuidLookup::getInstance).thenReturn(lookup);
-			assertEquals(bukkitUuid, VotingPluginMainAccess.placeholderStorageUuid(player, false));
+			assertEquals(bukkitUuid, VotingPluginMain.placeholderStorageUuid(player, false));
 		}
 	}
 
@@ -186,7 +184,7 @@ class VotingPluginMainPlaceholderPresenceTest {
 
 		try (var uuidLookup = mockStatic(UuidLookup.class)) {
 			uuidLookup.when(UuidLookup::getInstance).thenReturn(lookup);
-			assertEquals(bukkitUuid, VotingPluginMainAccess.placeholderStorageUuid(player, true));
+			assertEquals(bukkitUuid, VotingPluginMain.placeholderStorageUuid(player, true));
 		}
 	}
 }

VotingPlugin/src/test/java/com/bencodez/votingplugin/backendproxy/BackendProxyHandlerLifecycleTest.java

@@ -1,10 +1,4 @@
-package com.bencodez.votingplugin.tests.backendproxy;
-
-import com.bencodez.votingplugin.tests.backendproxy.cache.ProcessedVoteCacheAccess;
-import com.bencodez.votingplugin.tests.support.ReflectiveAccess;
-
-import com.bencodez.votingplugin.backendproxy.BackendOrderedVoteOverflowQueue;
-import com.bencodez.votingplugin.backendproxy.BackendProxyHandler;
+package com.bencodez.votingplugin.backendproxy;
 
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -203,7 +197,7 @@ class BackendProxyHandlerLifecycleTest {
 					TransportEnvelopeEncryption.Domain.PROXY_BACKEND, false));
 			BackendProxyTransportManager manager = (BackendProxyTransportManager) getField(handler, "transportManager");
 			BackendProxyTransport transport = method == BungeeMethod.REDIS
-					? new RedisBackendProxyTransport(plugin, ProcessedVoteCacheAccess.create())
+					? new RedisBackendProxyTransport(plugin, new ProcessedVoteCache())
 					: new MqttBackendProxyTransport(plugin);
 			setField(transport, "authenticator", SharedTransportEnvelopeAuthenticator.load(keyFile,
 					Mode.COMPATIBILITY));
@@ -239,7 +233,7 @@ class BackendProxyHandlerLifecycleTest {
 		setField(handler, "method", BungeeMethod.REDIS);
 		setField(handler, "sharedTransportMode", Mode.COMPATIBILITY);
 		setField(handler, "communicationEncryptionEnabled", false);
-		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(plugin, ProcessedVoteCacheAccess.create());
+		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(plugin, new ProcessedVoteCache());
 		SharedTransportEnvelopeAuthenticator original = SharedTransportEnvelopeAuthenticator.load(
 				dataDirectory.resolve("secretkey.key"), Mode.COMPATIBILITY);
 		setField(transport, "authenticator", original);
@@ -273,7 +267,7 @@ class BackendProxyHandlerLifecycleTest {
 			setField(handler, "communicationEncryption", originalEncryption);
 			BackendProxyTransportManager manager = (BackendProxyTransportManager) getField(handler, "transportManager");
 			BackendProxyTransport transport = method == BungeeMethod.REDIS
-					? new RedisBackendProxyTransport(plugin, ProcessedVoteCacheAccess.create())
+					? new RedisBackendProxyTransport(plugin, new ProcessedVoteCache())
 					: new MqttBackendProxyTransport(plugin);
 			SharedTransportEnvelopeAuthenticator originalAuthenticator =
 					SharedTransportEnvelopeAuthenticator.load(keyFile, Mode.REQUIRED);
@@ -304,7 +298,7 @@ class BackendProxyHandlerLifecycleTest {
 		handler.activateInboundMessages();
 		Runnable localDispatch = mock(Runnable.class);
 
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler,
+		handler.dispatchIncomingAfterPublication(
 				JsonEnvelope.builder(VotingPluginWire.SUB_BUNGEE_TIME_CHANGE).build(), localDispatch);
 
 		verify(scheduler).runTaskAsynchronously(plugin, localDispatch);
@@ -344,9 +338,9 @@ class BackendProxyHandlerLifecycleTest {
 			return null;
 		}).when(router).handleOrderedVote(any(JsonEnvelope.class), any());
 
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, voteEnvelope, mock(Runnable.class));
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, updateEnvelope, mock(Runnable.class));
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, onlineEnvelope, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(voteEnvelope, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(updateEnvelope, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(onlineEnvelope, mock(Runnable.class));
 
 		assertEquals(1, asyncTasks.size(), "only the head of the ordered vote lane should be scheduled");
 
@@ -397,9 +391,9 @@ class BackendProxyHandlerLifecycleTest {
 			return null;
 		}).when(router).handleOrderedVote(eq(release), any());
 
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, blockedVote, mock(Runnable.class));
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, release, mock(Runnable.class));
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, secondRelease, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(blockedVote, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(release, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(secondRelease, mock(Runnable.class));
 
 		assertEquals(2, asyncTasks.size(), "only one durable release should use the bounded release worker");
 		asyncTasks.removeLast().run();
@@ -425,7 +419,7 @@ class BackendProxyHandlerLifecycleTest {
 		doThrow(new java.util.concurrent.RejectedExecutionException("stopping"))
 				.when(scheduler).runTaskAsynchronously(eq(plugin), any(Runnable.class));
 
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, release, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(release, mock(Runnable.class));
 
 		verify(router, never()).handleOrderedVote(eq(release), any());
 		AtomicBoolean active = (AtomicBoolean) getField(handler, "durableReceiptReleaseActive");
@@ -488,8 +482,8 @@ class BackendProxyHandlerLifecycleTest {
 				"survival", UUID.randomUUID(), VotingPluginWire.SUB_VOTE);
 		when(router.isValidReceiptRelease(release)).thenReturn(true);
 
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, olderVote, mock(Runnable.class));
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, release, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(olderVote, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(release, mock(Runnable.class));
 
 		@SuppressWarnings("unchecked")
 		ArrayDeque<JsonEnvelope> queued = (ArrayDeque<JsonEnvelope>) getField(handler, "orderedVoteDispatchQueue");
@@ -527,7 +521,7 @@ class BackendProxyHandlerLifecycleTest {
 				VotingPluginWire.vote("Player", UUID.randomUUID().toString(), "site", 10L,
 						true, true, "", voteId, false, false, 1, 1));
 
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, envelope, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(envelope, mock(Runnable.class));
 		dispatch.get().run();
 		verifyNoInteractions(messages);
 		completion.get().accept(OrderedVoteOutcome.COMPLETE);
@@ -566,7 +560,7 @@ class BackendProxyHandlerLifecycleTest {
 				VotingPluginWire.voteDelayRejected("Player", UUID.randomUUID().toString(),
 						"site", true, voteId));
 
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, envelope, mock(Runnable.class));
+		handler.dispatchIncomingAfterPublication(envelope, mock(Runnable.class));
 		dispatch.get().run();
 		verifyNoInteractions(messages);
 		completion.get().accept(OrderedVoteOutcome.COMPLETE);
@@ -586,19 +580,19 @@ class BackendProxyHandlerLifecycleTest {
 		when(plugin.getLogger()).thenReturn(Logger.getLogger("ordered-overflow-test"));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			setField(handler, "messageRouter", mock(BackendProxyMessageRouter.class));
 			handler.activateInboundMessages();
 
-			for (int i = 0; i < BackendProxyHandlerAccess.MAX_ORDERED_VOTE_QUEUE + 1; i++) {
-				BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			for (int i = 0; i < BackendProxyHandler.MAX_ORDERED_VOTE_QUEUE + 1; i++) {
+				handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 						.put(VotingPluginWire.K_VOTE_ID, new java.util.UUID(0L, i + 1L).toString()).build(),
 						mock(Runnable.class));
 			}
 
 			@SuppressWarnings("unchecked")
 			ArrayDeque<JsonEnvelope> queued = (ArrayDeque<JsonEnvelope>) getField(handler, "orderedVoteDispatchQueue");
-			assertEquals(BackendProxyHandlerAccess.MAX_ORDERED_VOTE_QUEUE, queued.size());
+			assertEquals(BackendProxyHandler.MAX_ORDERED_VOTE_QUEUE, queued.size());
 			assertEquals(1, overflow.size());
 		} finally {
 			overflow.close();
@@ -656,14 +650,14 @@ class BackendProxyHandlerLifecycleTest {
 		blocker.start();
 		assertTrue(locked.await(3, TimeUnit.SECONDS));
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			setField(handler, "messageRouter", mock(BackendProxyMessageRouter.class));
 			handler.activateInboundMessages();
-			for (int index = 0; index < BackendProxyHandlerAccess.MAX_ORDERED_VOTE_QUEUE; index++) {
-				BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			for (int index = 0; index < BackendProxyHandler.MAX_ORDERED_VOTE_QUEUE; index++) {
+				handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 						.put("sequence", Integer.toString(index)).build(), mock(Runnable.class));
 			}
-			CompletableFuture<Void> admission = CompletableFuture.runAsync(() -> BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler,
+			CompletableFuture<Void> admission = CompletableFuture.runAsync(() -> handler.dispatchIncomingAfterPublication(
 					JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).put("sequence", "overflow").build(),
 					mock(Runnable.class)));
 			admission.get(500, TimeUnit.MILLISECONDS);
@@ -690,7 +684,7 @@ class BackendProxyHandlerLifecycleTest {
 		when(plugin.getLogger()).thenReturn(Logger.getLogger("ordered-unreadable-test"));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			assertFalse(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
+			assertFalse(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
 		} finally {
 			overflow.close();
 		}
@@ -711,7 +705,7 @@ class BackendProxyHandlerLifecycleTest {
 		Files.writeString(queueFile, malformed);
 		BackendOrderedVoteOverflowQueue malformedQueue = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			assertFalse(BackendOrderedVoteOverflowQueueAccess.enqueue(malformedQueue, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
+			assertFalse(malformedQueue.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
 		} finally {
 			malformedQueue.close();
 		}
@@ -725,7 +719,7 @@ class BackendProxyHandlerLifecycleTest {
 		Files.writeString(queueFile, unsupported);
 		BackendOrderedVoteOverflowQueue unsupportedQueue = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			assertFalse(BackendOrderedVoteOverflowQueueAccess.enqueue(unsupportedQueue, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
+			assertFalse(unsupportedQueue.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
 		} finally {
 			unsupportedQueue.close();
 		}
@@ -740,7 +734,7 @@ class BackendProxyHandlerLifecycleTest {
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
 			Files.createDirectory(tempDir.resolve("BackendProxyVoteQueue.yml"));
-			assertFalse(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
+			assertFalse(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
 			assertEquals(0, overflow.size());
 		} finally {
 			overflow.close();
@@ -750,7 +744,7 @@ class BackendProxyHandlerLifecycleTest {
 	@Test
 	void oversizedFailureHistoryStopsRecoveryWithoutDiscardingEvidence(@TempDir Path tempDir) throws Exception {
 		StringBuilder yaml = new StringBuilder("Envelopes: []\nFailedEnvelopes:\n");
-		for (int index = 0; index < BackendOrderedVoteOverflowQueueAccess.MAX_FAILED_ENTRIES + 20; index++) {
+		for (int index = 0; index < BackendOrderedVoteOverflowQueue.MAX_FAILED_ENTRIES + 20; index++) {
 			yaml.append("- failed-").append(index).append('\n');
 		}
 		Files.writeString(tempDir.resolve("BackendProxyVoteQueue.yml"), yaml);
@@ -759,8 +753,8 @@ class BackendProxyHandlerLifecycleTest {
 		when(plugin.getLogger()).thenReturn(Logger.getLogger("ordered-failure-bound-test"));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			assertEquals(0, BackendOrderedVoteOverflowQueueAccess.failedSize(overflow));
-			assertFalse(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
+			assertEquals(0, overflow.failedSize());
+			assertFalse(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
 			assertTrue(Files.readString(tempDir.resolve("BackendProxyVoteQueue.yml")).contains("failed-0"));
 		} finally {
 			overflow.close();
@@ -770,7 +764,7 @@ class BackendProxyHandlerLifecycleTest {
 	@Test
 	void fullFailureHistoryRejectsNextQuarantineWithoutEviction(@TempDir Path tempDir) throws Exception {
 		StringBuilder yaml = new StringBuilder("Envelopes: []\nFailedEnvelopes:\n");
-		for (int index = 0; index < BackendOrderedVoteOverflowQueueAccess.MAX_FAILED_ENTRIES; index++) {
+		for (int index = 0; index < BackendOrderedVoteOverflowQueue.MAX_FAILED_ENTRIES; index++) {
 			yaml.append("- failed-").append(index).append('\n');
 		}
 		Files.writeString(tempDir.resolve("BackendProxyVoteQueue.yml"), yaml);
@@ -779,10 +773,10 @@ class BackendProxyHandlerLifecycleTest {
 		when(plugin.getLogger()).thenReturn(Logger.getLogger("ordered-failure-capacity-test"));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			assertFalse(BackendOrderedVoteOverflowQueueAccess.quarantineForShutdown(overflow, null, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			assertFalse(overflow.quarantineForShutdown(null, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 					.put("sequence", "rejected").build()));
-			assertEquals(BackendOrderedVoteOverflowQueueAccess.MAX_FAILED_ENTRIES, BackendOrderedVoteOverflowQueueAccess.failedSize(overflow));
-			assertTrue(BackendOrderedVoteOverflowQueueAccess.isQuarantineCapacityExhausted(overflow));
+			assertEquals(BackendOrderedVoteOverflowQueue.MAX_FAILED_ENTRIES, overflow.failedSize());
+			assertTrue(overflow.isQuarantineCapacityExhausted());
 			@SuppressWarnings("unchecked")
 			ArrayDeque<String> failures = (ArrayDeque<String>) getField(overflow, "failedEntries");
 			assertEquals("failed-0", failures.peekFirst());
@@ -790,9 +784,9 @@ class BackendProxyHandlerLifecycleTest {
 
 			BukkitScheduler scheduler = mock(BukkitScheduler.class);
 			when(plugin.getBukkitScheduler()).thenReturn(scheduler);
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			handler.activateInboundMessages();
-			BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build(),
+			handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build(),
 					mock(Runnable.class));
 			verify(scheduler, never()).runTaskAsynchronously(eq(plugin), any(Runnable.class));
 		} finally {
@@ -810,19 +804,19 @@ class BackendProxyHandlerLifecycleTest {
 				UUID.randomUUID().toString(), "site", 10L, true, true, "", voteId, false, false, 1, 1));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			assertTrue(BackendOrderedVoteOverflowQueueAccess.quarantineForShutdown(overflow, null, vote));
+			assertTrue(overflow.quarantineForShutdown(null, vote));
 			long firstDeadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(3);
-			while (BackendOrderedVoteOverflowQueueAccess.failedSize(overflow) != 1 && System.nanoTime() < firstDeadline) Thread.sleep(10L);
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(overflow));
+			while (overflow.failedSize() != 1 && System.nanoTime() < firstDeadline) Thread.sleep(10L);
+			assertEquals(1, overflow.failedSize());
 
-			assertTrue(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, vote));
-			BackendOrderedVoteOverflowQueueAccess.PendingEnvelope retry = BackendOrderedVoteOverflowQueueAccess.peekDurable(overflow);
+			assertTrue(overflow.enqueue(vote));
+			BackendOrderedVoteOverflowQueue.PendingEnvelope retry = overflow.peekDurable();
 			assertNotNull(retry);
 			CompletableFuture<Boolean> quarantined = new CompletableFuture<>();
-			BackendOrderedVoteOverflowQueueAccess.quarantineAsync(overflow, retry, vote, quarantined::complete);
+			overflow.quarantineAsync(retry, vote, quarantined::complete);
 
 			assertTrue(quarantined.get(3, TimeUnit.SECONDS));
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(overflow));
+			assertEquals(1, overflow.failedSize());
 			assertEquals(0, overflow.size());
 		} finally {
 			overflow.close();
@@ -830,7 +824,7 @@ class BackendProxyHandlerLifecycleTest {
 
 		BackendOrderedVoteOverflowQueue recovered = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(recovered));
+			assertEquals(1, recovered.failedSize());
 			assertEquals(0, recovered.size());
 		} finally {
 			recovered.close();
@@ -851,7 +845,7 @@ class BackendProxyHandlerLifecycleTest {
 		}).when(scheduler).runTaskAsynchronously(eq(plugin), any(Runnable.class));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			BackendProxyMessageRouter router = mock(BackendProxyMessageRouter.class);
 			setField(handler, "messageRouter", router);
 			AtomicInteger attempts = new AtomicInteger();
@@ -862,9 +856,9 @@ class BackendProxyHandlerLifecycleTest {
 				return null;
 			}).when(router).handleOrderedVote(any(JsonEnvelope.class), any());
 			handler.activateInboundMessages();
-			assertTrue(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			assertTrue(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 					.put("sequence", "failed").build()));
-			assertTrue(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			assertTrue(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 					.put("sequence", "next").build()));
 			Runnable first = asyncTasks.poll(3, TimeUnit.SECONDS);
 			assertNotNull(first);
@@ -876,7 +870,7 @@ class BackendProxyHandlerLifecycleTest {
 			long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(3);
 			while (overflow.size() != 0 && System.nanoTime() < deadline) Thread.sleep(10);
 			assertEquals(0, overflow.size());
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(overflow));
+			assertEquals(1, overflow.failedSize());
 			assertTrue(Files.exists(tempDir.resolve("BackendProxyVoteQueue.yml")));
 		} finally {
 			overflow.close();
@@ -884,7 +878,7 @@ class BackendProxyHandlerLifecycleTest {
 		BackendOrderedVoteOverflowQueue recovered = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
 			assertEquals(0, recovered.size());
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(recovered));
+			assertEquals(1, recovered.failedSize());
 		} finally {
 			recovered.close();
 		}
@@ -904,22 +898,22 @@ class BackendProxyHandlerLifecycleTest {
 		}).when(scheduler).runTaskAsynchronously(eq(plugin), any(Runnable.class));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			BackendProxyMessageRouter router = mock(BackendProxyMessageRouter.class);
 			setField(handler, "messageRouter", router);
 			doThrow(new IllegalStateException("partial reward")).when(router)
 					.handleOrderedVote(any(JsonEnvelope.class), any());
 			handler.activateInboundMessages();
-			BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 					.put("sequence", "failed").build(), mock(Runnable.class));
 			Runnable first = asyncTasks.poll(3, TimeUnit.SECONDS);
 			assertNotNull(first);
 			assertThrows(IllegalStateException.class, first::run);
 			long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(3);
-			while (BackendOrderedVoteOverflowQueueAccess.failedSize(overflow) == 0 && System.nanoTime() < deadline) {
+			while (overflow.failedSize() == 0 && System.nanoTime() < deadline) {
 				Thread.sleep(10);
 			}
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(overflow));
+			assertEquals(1, overflow.failedSize());
 			assertEquals(0, overflow.size());
 			assertTrue(asyncTasks.isEmpty(), "failed reward must not be retried");
 		} finally {
@@ -953,13 +947,13 @@ class BackendProxyHandlerLifecycleTest {
 		});
 		assertTrue(occupied.await(3, TimeUnit.SECONDS));
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			BackendProxyMessageRouter router = mock(BackendProxyMessageRouter.class);
 			setField(handler, "messageRouter", router);
 			doThrow(new IllegalStateException("partial reward")).when(router)
 					.handleOrderedVote(any(JsonEnvelope.class), any());
 			handler.activateInboundMessages();
-			BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 					.put("sequence", "failed").build(), mock(Runnable.class));
 			Runnable first = asyncTasks.poll(3, TimeUnit.SECONDS);
 			assertNotNull(first);
@@ -972,7 +966,7 @@ class BackendProxyHandlerLifecycleTest {
 		BackendOrderedVoteOverflowQueue recovered = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
 			assertEquals(0, recovered.size());
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(recovered));
+			assertEquals(1, recovered.failedSize());
 		} finally {
 			recovered.close();
 		}
@@ -986,29 +980,29 @@ class BackendProxyHandlerLifecycleTest {
 		when(plugin.getLogger()).thenReturn(Logger.getLogger("ordered-capacity-test"));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			handler.activateInboundMessages();
-			for (int index = 0; index < BackendProxyHandlerAccess.MAX_ORDERED_VOTE_QUEUE; index++) {
-				BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			for (int index = 0; index < BackendProxyHandler.MAX_ORDERED_VOTE_QUEUE; index++) {
+				handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 						.put("sequence", Integer.toString(index)).build(), mock(Runnable.class));
 			}
-			for (int index = 0; index < BackendOrderedVoteOverflowQueueAccess.MAX_NORMAL_ENTRIES; index++) {
-				assertTrue(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
-						.put("sequence", Integer.toString(index + BackendProxyHandlerAccess.MAX_ORDERED_VOTE_QUEUE))
-						.build(), BackendProxyHandlerAccess.MAX_ORDERED_VOTE_QUEUE));
+			for (int index = 0; index < BackendOrderedVoteOverflowQueue.MAX_NORMAL_ENTRIES; index++) {
+				assertTrue(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+						.put("sequence", Integer.toString(index + BackendProxyHandler.MAX_ORDERED_VOTE_QUEUE))
+						.build(), BackendProxyHandler.MAX_ORDERED_VOTE_QUEUE));
 			}
-			assertFalse(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build(),
-					BackendProxyHandlerAccess.MAX_ORDERED_VOTE_QUEUE));
+			assertFalse(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build(),
+					BackendProxyHandler.MAX_ORDERED_VOTE_QUEUE));
 			handler.close();
-			assertEquals(BackendProxyHandlerAccess.MAX_ORDERED_VOTE_QUEUE
-					+ BackendOrderedVoteOverflowQueueAccess.MAX_NORMAL_ENTRIES, overflow.size());
+			assertEquals(BackendProxyHandler.MAX_ORDERED_VOTE_QUEUE
+					+ BackendOrderedVoteOverflowQueue.MAX_NORMAL_ENTRIES, overflow.size());
 		} finally {
 			overflow.close();
 		}
 		BackendOrderedVoteOverflowQueue recovered = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			assertEquals(BackendProxyHandlerAccess.MAX_ORDERED_VOTE_QUEUE
-					+ BackendOrderedVoteOverflowQueueAccess.MAX_NORMAL_ENTRIES, recovered.size());
+			assertEquals(BackendProxyHandler.MAX_ORDERED_VOTE_QUEUE
+					+ BackendOrderedVoteOverflowQueue.MAX_NORMAL_ENTRIES, recovered.size());
 		} finally {
 			recovered.close();
 		}
@@ -1028,7 +1022,7 @@ class BackendProxyHandlerLifecycleTest {
 		}).when(scheduler).runTaskAsynchronously(eq(plugin), any(Runnable.class));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			BackendProxyMessageRouter router = mock(BackendProxyMessageRouter.class);
 			setField(handler, "messageRouter", router);
 			AtomicInteger attempts = new AtomicInteger();
@@ -1039,7 +1033,7 @@ class BackendProxyHandlerLifecycleTest {
 				return null;
 			}).when(router).handleOrderedVote(any(JsonEnvelope.class), any());
 			handler.activateInboundMessages();
-			assertTrue(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).build()));
+			assertTrue(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).build()));
 
 			Runnable first = asyncTasks.poll(3, TimeUnit.SECONDS);
 			assertNotNull(first, "durable head must wake the ordered lane");
@@ -1073,7 +1067,7 @@ class BackendProxyHandlerLifecycleTest {
 		}).when(scheduler).runTaskAsynchronously(eq(plugin), any(Runnable.class));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			BackendProxyMessageRouter router = mock(BackendProxyMessageRouter.class);
 			setField(handler, "messageRouter", router);
 			doAnswer(invocation -> {
@@ -1082,7 +1076,7 @@ class BackendProxyHandlerLifecycleTest {
 				return null;
 			}).when(router).handleOrderedVote(any(JsonEnvelope.class), any());
 			handler.activateInboundMessages();
-			assertTrue(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
+			assertTrue(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()));
 			asyncTasks.poll(3, TimeUnit.SECONDS).run();
 			long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(3);
 			while (overflow.size() != 0 && System.nanoTime() < deadline) Thread.sleep(10);
@@ -1124,11 +1118,11 @@ class BackendProxyHandlerLifecycleTest {
 		try {
 			overflow.close();
 			assertTrue(System.nanoTime() - started < TimeUnit.SECONDS.toNanos(4));
-			assertEquals(BackendOrderedVoteOverflowQueueAccess.CloseState.WAITING_TO_PERSIST, BackendOrderedVoteOverflowQueueAccess.closeState(overflow));
+			assertEquals(BackendOrderedVoteOverflowQueue.CloseState.WAITING_TO_PERSIST, overflow.closeState());
 		} finally {
 			release.countDown();
 			blocker.join(3_000L);
-			assertTrue(BackendOrderedVoteOverflowQueueAccess.awaitClose(overflow, 3_000L));
+			assertTrue(overflow.awaitClose(3_000L));
 		}
 	}
 
@@ -1143,7 +1137,7 @@ class BackendProxyHandlerLifecycleTest {
 		when(plugin.getDataFolder()).thenReturn(tempDir.toFile());
 		when(plugin.getLogger()).thenReturn(logger);
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
-		assertTrue(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).put("sequence", "slow").build()));
+		assertTrue(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).put("sequence", "slow").build()));
 		Object persistenceLock = getField(overflow, "persistenceWriteLock");
 		CountDownLatch locked = new CountDownLatch(1);
 		Thread blocker = new Thread(() -> {
@@ -1162,7 +1156,7 @@ class BackendProxyHandlerLifecycleTest {
 		overflow.close();
 		blocker.join(3_000L);
 		assertTrue(System.nanoTime() - started >= TimeUnit.SECONDS.toNanos(1));
-		assertEquals(BackendOrderedVoteOverflowQueueAccess.CloseState.COMPLETE, BackendOrderedVoteOverflowQueueAccess.closeState(overflow));
+		assertEquals(BackendOrderedVoteOverflowQueue.CloseState.COMPLETE, overflow.closeState());
 		assertFalse(logs.hasLevel(Level.SEVERE));
 
 		BackendOrderedVoteOverflowQueue recovered = new BackendOrderedVoteOverflowQueue(plugin);
@@ -1189,7 +1183,7 @@ class BackendProxyHandlerLifecycleTest {
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		overflow.close();
 
-		assertEquals(BackendOrderedVoteOverflowQueueAccess.CloseState.FAILED, BackendOrderedVoteOverflowQueueAccess.closeState(overflow));
+		assertEquals(BackendOrderedVoteOverflowQueue.CloseState.FAILED, overflow.closeState());
 		assertTrue(logs.hasLevel(Level.SEVERE));
 		LogRecord failure = logs.records.stream()
 				.filter(record -> record.getLevel() == Level.SEVERE)
@@ -1229,9 +1223,9 @@ class BackendProxyHandlerLifecycleTest {
 			return null;
 		}).when(router).handleOrderedVote(any(JsonEnvelope.class), any());
 		handler.activateInboundMessages();
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE)
+		handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE)
 				.put("sequence", "first").build(), mock(Runnable.class));
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+		handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 				.put("sequence", "second").build(), mock(Runnable.class));
 
 		asyncTasks.removeFirst().run();
@@ -1252,12 +1246,12 @@ class BackendProxyHandlerLifecycleTest {
 		when(plugin.getLogger()).thenReturn(Logger.getLogger("ordered-shutdown-test"));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			BackendProxyTransportManager transport = mock(BackendProxyTransportManager.class);
 			setField(handler, "transportManager", transport);
 			handler.activateInboundMessages();
 			doAnswer(invocation -> {
-				BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler,
+				handler.dispatchIncomingAfterPublication(
 						JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build(), mock(Runnable.class));
 				return null;
 			}).when(transport).close();
@@ -1289,7 +1283,7 @@ class BackendProxyHandlerLifecycleTest {
 		}).when(scheduler).runTaskAsynchronously(eq(plugin), any(Runnable.class));
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			BackendProxyMessageRouter router = mock(BackendProxyMessageRouter.class);
 			setField(handler, "messageRouter", router);
 			AtomicReference<java.util.function.Consumer<OrderedVoteOutcome>> completion = new AtomicReference<>();
@@ -1298,9 +1292,9 @@ class BackendProxyHandlerLifecycleTest {
 				return null;
 			}).when(router).handleOrderedVote(any(JsonEnvelope.class), any());
 			handler.activateInboundMessages();
-			BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 					.put("sequence", "active").build(), mock(Runnable.class));
-			BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 					.put("sequence", "later").build(), mock(Runnable.class));
 			asyncTasks.removeFirst().run();
 			CompletableFuture<Void> closing = CompletableFuture.runAsync(handler::close);
@@ -1329,7 +1323,7 @@ class BackendProxyHandlerLifecycleTest {
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		AtomicReference<java.util.function.Consumer<OrderedVoteOutcome>> completion = new AtomicReference<>();
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			BackendProxyMessageRouter router = mock(BackendProxyMessageRouter.class);
 			setField(handler, "messageRouter", router);
 			doAnswer(invocation -> {
@@ -1337,26 +1331,26 @@ class BackendProxyHandlerLifecycleTest {
 				return null;
 			}).when(router).handleOrderedVote(any(JsonEnvelope.class), any());
 			handler.activateInboundMessages();
-			BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 					.put("sequence", "active").build(), mock(Runnable.class));
-			BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			handler.dispatchIncomingAfterPublication(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 					.put("sequence", "later").build(), mock(Runnable.class));
 			asyncTasks.removeFirst().run();
 
 			CompletableFuture.runAsync(handler::close).get(3, TimeUnit.SECONDS);
 			long quarantineDeadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(3);
-			while (BackendOrderedVoteOverflowQueueAccess.failedSize(overflow) != 1 && System.nanoTime() < quarantineDeadline) Thread.sleep(10L);
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(overflow));
+			while (overflow.failedSize() != 1 && System.nanoTime() < quarantineDeadline) Thread.sleep(10L);
+			assertEquals(1, overflow.failedSize());
 			assertEquals(1, overflow.size());
 			completion.get().accept(OrderedVoteOutcome.COMPLETE);
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(overflow));
+			assertEquals(1, overflow.failedSize());
 			assertEquals(1, overflow.size());
 		} finally {
 			overflow.close();
 		}
 		BackendOrderedVoteOverflowQueue recovered = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(recovered));
+			assertEquals(1, recovered.failedSize());
 			assertEquals(1, recovered.size());
 		} finally {
 			recovered.close();
@@ -1378,32 +1372,32 @@ class BackendProxyHandlerLifecycleTest {
 		BackendOrderedVoteOverflowQueue overflow = new BackendOrderedVoteOverflowQueue(plugin);
 		AtomicReference<java.util.function.Consumer<OrderedVoteOutcome>> completion = new AtomicReference<>();
 		try {
-			BackendProxyHandler handler = new BackendProxyHandler(plugin, ProcessedVoteCacheAccess.create(), overflow);
+			BackendProxyHandler handler = new BackendProxyHandler(plugin, new ProcessedVoteCache(), overflow);
 			BackendProxyMessageRouter router = mock(BackendProxyMessageRouter.class);
 			setField(handler, "messageRouter", router);
 			doAnswer(invocation -> {
 				completion.set(invocation.getArgument(1));
 				return null;
 			}).when(router).handleOrderedVote(any(JsonEnvelope.class), any());
-			assertTrue(BackendOrderedVoteOverflowQueueAccess.enqueue(overflow, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
+			assertTrue(overflow.enqueue(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE)
 					.put("sequence", "active").build()));
 			handler.activateInboundMessages();
 			asyncTasks.removeFirst().run();
 
 			CompletableFuture.runAsync(handler::close).get(3, TimeUnit.SECONDS);
 			long quarantineDeadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(3);
-			while (BackendOrderedVoteOverflowQueueAccess.failedSize(overflow) != 1 && System.nanoTime() < quarantineDeadline) Thread.sleep(10L);
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(overflow));
+			while (overflow.failedSize() != 1 && System.nanoTime() < quarantineDeadline) Thread.sleep(10L);
+			assertEquals(1, overflow.failedSize());
 			assertEquals(0, overflow.size());
 			completion.get().accept(OrderedVoteOutcome.COMPLETE);
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(overflow));
+			assertEquals(1, overflow.failedSize());
 			assertEquals(0, overflow.size());
 		} finally {
 			overflow.close();
 		}
 		BackendOrderedVoteOverflowQueue recovered = new BackendOrderedVoteOverflowQueue(plugin);
 		try {
-			assertEquals(1, BackendOrderedVoteOverflowQueueAccess.failedSize(recovered));
+			assertEquals(1, recovered.failedSize());
 			assertEquals(0, recovered.size());
 		} finally {
 			recovered.close();
@@ -1425,12 +1419,12 @@ class BackendProxyHandlerLifecycleTest {
 
 		JsonEnvelope first = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).put("sequence", "1").build();
 		JsonEnvelope second = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).put("sequence", "2").build();
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(previous, first, mock(Runnable.class));
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(previous, second, mock(Runnable.class));
+		previous.dispatchIncomingAfterPublication(first, mock(Runnable.class));
+		previous.dispatchIncomingAfterPublication(second, mock(Runnable.class));
 
 		previous.completeOrderedVoteHandoff(replacement);
 		JsonEnvelope late = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_ONLINE).put("sequence", "3").build();
-		BackendProxyHandlerAccess.dispatchIncomingAfterPublication(previous, late, mock(Runnable.class));
+		previous.dispatchIncomingAfterPublication(late, mock(Runnable.class));
 
 		ArrayDeque<Runnable> asyncTasks = new ArrayDeque<>();
 		doAnswer(invocation -> {
@@ -1504,7 +1498,7 @@ class BackendProxyHandlerLifecycleTest {
 
 		CompletableFuture<Void> callback = CompletableFuture.runAsync(() -> {
 			started.countDown();
-			BackendProxyHandlerAccess.dispatchIncomingAfterPublication(handler, envelope, localDispatch);
+			handler.dispatchIncomingAfterPublication(envelope, localDispatch);
 		});
 		assertTrue(started.await(1, TimeUnit.SECONDS));
 		assertFalse(callback.isDone());
@@ -1530,7 +1524,7 @@ class BackendProxyHandlerLifecycleTest {
 
 		CompletableFuture<Void> callback = CompletableFuture.runAsync(() -> {
 			started.countDown();
-			BackendProxyHandlerAccess.dispatchIncomingAfterPublication(replacement, envelope, replacementDispatch);
+			replacement.dispatchIncomingAfterPublication(envelope, replacementDispatch);
 		});
 		assertTrue(started.await(1, TimeUnit.SECONDS));
 		assertFalse(callback.isDone());
@@ -1562,7 +1556,7 @@ class BackendProxyHandlerLifecycleTest {
 
 		CompletableFuture<Void> callback = CompletableFuture.runAsync(() -> {
 			started.countDown();
-			BackendProxyHandlerAccess.dispatchIncomingAfterPublication(replacement, envelope, replacementDispatch);
+			replacement.dispatchIncomingAfterPublication(envelope, replacementDispatch);
 		});
 		assertTrue(started.await(1, TimeUnit.SECONDS));
 		assertFalse(callback.isDone());
@@ -1614,7 +1608,7 @@ class BackendProxyHandlerLifecycleTest {
 		try {
 			Field transportField = BackendProxyTransportManager.class.getDeclaredField("transport");
 			transportField.setAccessible(true);
-			ReflectiveAccess.set(transportField, manager, previous);
+			transportField.set(manager, previous);
 			manager.restoreAfterFailedReplacement();
 		} catch (ReflectiveOperationException failure) {
 			throw new AssertionError(failure);
@@ -1683,7 +1677,7 @@ class BackendProxyHandlerLifecycleTest {
 		Field targetField = com.bencodez.votingplugin.VotingPluginMain.class
 				.getDeclaredField("backendPluginMessageTarget");
 		targetField.setAccessible(true);
-		ReflectiveAccess.set(targetField, plugin, new AtomicReference<GlobalMessageHandler>());
+		targetField.set(plugin, new AtomicReference<GlobalMessageHandler>());
 
 		plugin.activateBackendPluginMessageHandler(firstTarget);
 		current.set(second);
@@ -1870,7 +1864,7 @@ class BackendProxyHandlerLifecycleTest {
 		BackendPresenceManager presence = mock(BackendPresenceManager.class);
 		Field field = BackendProxyHandler.class.getDeclaredField("presenceManager");
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, handler, presence);
+		field.set(handler, presence);
 
 		verifyNoInteractions(presence);
 		handler.activatePresenceReporting();
@@ -1886,7 +1880,7 @@ class BackendProxyHandlerLifecycleTest {
 		org.mockito.Mockito.doThrow(new java.util.concurrent.RejectedExecutionException()).when(presence).start();
 		Field presenceField = BackendProxyHandler.class.getDeclaredField("presenceManager");
 		presenceField.setAccessible(true);
-		ReflectiveAccess.set(presenceField, handler, presence);
+		presenceField.set(handler, presence);
 
 		Field managerField = BackendProxyHandler.class.getDeclaredField("transportManager");
 		managerField.setAccessible(true);
@@ -1894,7 +1888,7 @@ class BackendProxyHandlerLifecycleTest {
 		BackendProxyTransport transport = mock(BackendProxyTransport.class);
 		Field transportField = BackendProxyTransportManager.class.getDeclaredField("transport");
 		transportField.setAccessible(true);
-		ReflectiveAccess.set(transportField, manager, transport);
+		transportField.set(manager, transport);
 
 		assertThrows(java.util.concurrent.RejectedExecutionException.class, handler::activatePresenceReporting);
 
@@ -1904,7 +1898,7 @@ class BackendProxyHandlerLifecycleTest {
 
 	@Test
 	void sharesVoteDeduplicationAcrossHandlerReplacement() {
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create();
+		ProcessedVoteCache cache = new ProcessedVoteCache();
 		BackendProxyHandler previous = new BackendProxyHandler(null, cache);
 		BackendProxyHandler replacement = new BackendProxyHandler(null, cache);
 
@@ -1923,7 +1917,7 @@ class BackendProxyHandlerLifecycleTest {
 		BackendProxyTransport transport = mock(BackendProxyTransport.class);
 		Field transportField = BackendProxyTransportManager.class.getDeclaredField("transport");
 		transportField.setAccessible(true);
-		ReflectiveAccess.set(transportField, manager, transport);
+		transportField.set(manager, transport);
 
 		handler.prepareForReplacement(BungeeMethod.PLUGINMESSAGING);
 
@@ -1936,7 +1930,7 @@ class BackendProxyHandlerLifecycleTest {
 		SocketHandler socket = mock(SocketHandler.class);
 		Field field = SocketBackendProxyTransport.class.getDeclaredField("socketHandler");
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, handler, socket);
+		field.set(handler, socket);
 
 		handler.prepareForReplacement();
 
@@ -2023,10 +2017,10 @@ class BackendProxyHandlerLifecycleTest {
 		RedisHandler redis = mock(RedisHandler.class);
 		Field field = RedisBackendProxyTransport.class.getDeclaredField("redisHandler");
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, transport, redis);
+		field.set(transport, redis);
 		Field transportField = BackendProxyTransportManager.class.getDeclaredField("transport");
 		transportField.setAccessible(true);
-		ReflectiveAccess.set(transportField, manager, transport);
+		transportField.set(manager, transport);
 
 		handler.prepareForReplacement(BungeeMethod.REDIS);
 
@@ -2040,7 +2034,7 @@ class BackendProxyHandlerLifecycleTest {
 		MqttHandler mqtt = mock(MqttHandler.class);
 		Field field = MqttBackendProxyTransport.class.getDeclaredField("mqttHandler");
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, handler, mqtt);
+		field.set(handler, mqtt);
 
 		handler.prepareForReplacement();
 
@@ -2772,7 +2766,7 @@ class BackendProxyHandlerLifecycleTest {
 		MySqlMessenger messenger = mock(MySqlMessenger.class);
 		Field field = MysqlBackendProxyTransport.class.getDeclaredField("messenger");
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, handler, messenger);
+		field.set(handler, messenger);
 
 		handler.prepareForReplacement();
 
@@ -2917,7 +2911,7 @@ class BackendProxyHandlerLifecycleTest {
 		ScheduledExecutorService timer = mock(ScheduledExecutorService.class);
 		Field field = BackendGlobalDataSync.class.getDeclaredField("timer");
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, handler, timer);
+		field.set(handler, timer);
 
 		handler.close();
 
@@ -2950,7 +2944,7 @@ class BackendProxyHandlerLifecycleTest {
 			try {
 				Field field = type.getDeclaredField(name);
 				field.setAccessible(true);
-				ReflectiveAccess.set(field, target, value);
+				field.set(target, value);
 				return;
 			} catch (NoSuchFieldException ignored) {
 				type = type.getSuperclass();

VotingPlugin/src/test/java/com/bencodez/votingplugin/backendproxy/cache/ProcessedVoteCacheDurabilityTest.java

@@ -1,7 +1,4 @@
-package com.bencodez.votingplugin.tests.backendproxy.cache;
-
-import com.bencodez.votingplugin.tests.backendproxy.cache.DurableVoteReceiptStoreAccess;
-import com.bencodez.votingplugin.backendproxy.cache.ProcessedVoteCache;
+package com.bencodez.votingplugin.backendproxy.cache;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -19,7 +16,7 @@ class ProcessedVoteCacheDurabilityTest {
 
 	@Test
 	void duplicateRetryDoesNotScanAndPruneUnrelatedEntries() {
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create(TimeUnit.MINUTES.toMillis(30), 2);
+		ProcessedVoteCache cache = new ProcessedVoteCache(TimeUnit.MINUTES.toMillis(30), 2);
 		UUID expired = UUID.randomUUID();
 		UUID live = UUID.randomUUID();
 		cache.getProcessedVotes().put(expired, 0L);
@@ -32,7 +29,7 @@ class ProcessedVoteCacheDurabilityTest {
 
 	@Test
 	void expiredHeadRetryReclaimsItsSlotBeforeSaturationCheck() {
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create(TimeUnit.MINUTES.toMillis(30), 1);
+		ProcessedVoteCache cache = new ProcessedVoteCache(TimeUnit.MINUTES.toMillis(30), 1);
 		UUID expired = UUID.randomUUID();
 		cache.getProcessedVotes().put(expired, 0L);
 
@@ -47,44 +44,44 @@ class ProcessedVoteCacheDurabilityTest {
 	void releaseTombstoneCapacityCoversSustainedVoteThroughputForFullTtl() {
 		long threeVotesPerSecondForOneDay = TimeUnit.DAYS.toSeconds(1) * 3;
 
-		assertTrue(DurableVoteReceiptStoreAccess.MAX_RELEASE_TOMBSTONES >= threeVotesPerSecondForOneDay);
+		assertTrue(DurableVoteReceiptStore.MAX_RELEASE_TOMBSTONES >= threeVotesPerSecondForOneDay);
 	}
 
 	@Test
 	void completedVoteRemainsDeduplicatedAfterBackendRestart() {
 		Path receipts = directory.resolve("receipts.dat");
 		UUID voteId = UUID.randomUUID();
-		ProcessedVoteCache first = ProcessedVoteCacheAccess.create(receipts);
+		ProcessedVoteCache first = new ProcessedVoteCache(receipts);
 
 		assertTrue(first.reserve(voteId));
 		assertTrue(first.complete(voteId));
 		assertTrue(first.hasDurableReceipt(voteId));
-		assertFalse(ProcessedVoteCacheAccess.create(receipts).reserve(voteId));
+		assertFalse(new ProcessedVoteCache(receipts).reserve(voteId));
 	}
 
 	@Test
 	void reservationWithoutCompletionDoesNotSuppressRestartRetry() {
 		Path receipts = directory.resolve("receipts.dat");
 		UUID voteId = UUID.randomUUID();
-		assertTrue(ProcessedVoteCacheAccess.create(receipts).reserve(voteId));
+		assertTrue(new ProcessedVoteCache(receipts).reserve(voteId));
 
-		assertTrue(ProcessedVoteCacheAccess.create(receipts).reserve(voteId));
+		assertTrue(new ProcessedVoteCache(receipts).reserve(voteId));
 	}
 
 	@Test
 	void repairsTruncatedTailBeforeAppendingAnotherReceipt() throws Exception {
 		Path receipts = directory.resolve("receipts.dat");
 		UUID firstId = UUID.randomUUID();
-		ProcessedVoteCache first = ProcessedVoteCacheAccess.create(receipts);
+		ProcessedVoteCache first = new ProcessedVoteCache(receipts);
 		assertTrue(first.reserve(firstId));
 		assertTrue(first.complete(firstId));
 		Files.writeString(receipts, "truncated", StandardOpenOption.APPEND);
 
-		ProcessedVoteCache repaired = ProcessedVoteCacheAccess.create(receipts);
+		ProcessedVoteCache repaired = new ProcessedVoteCache(receipts);
 		UUID secondId = UUID.randomUUID();
 		assertTrue(repaired.reserve(secondId));
 		assertTrue(repaired.complete(secondId));
-		ProcessedVoteCache restarted = ProcessedVoteCacheAccess.create(receipts);
+		ProcessedVoteCache restarted = new ProcessedVoteCache(receipts);
 		assertFalse(restarted.reserve(firstId));
 		assertFalse(restarted.reserve(secondId));
 	}
@@ -94,14 +91,14 @@ class ProcessedVoteCacheDurabilityTest {
 		Path receipts = directory.resolve("receipts.dat");
 		UUID firstId = UUID.randomUUID();
 		UUID secondId = UUID.randomUUID();
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create(receipts);
+		ProcessedVoteCache cache = new ProcessedVoteCache(receipts);
 		assertTrue(cache.reserve(firstId));
 		assertTrue(cache.complete(firstId));
 		Files.writeString(receipts, "partial", StandardOpenOption.APPEND);
 
 		assertTrue(cache.reserve(secondId));
 		assertTrue(cache.complete(secondId));
-		ProcessedVoteCache restarted = ProcessedVoteCacheAccess.create(receipts);
+		ProcessedVoteCache restarted = new ProcessedVoteCache(receipts);
 		assertFalse(restarted.reserve(firstId));
 		assertFalse(restarted.reserve(secondId));
 	}
@@ -112,7 +109,7 @@ class ProcessedVoteCacheDurabilityTest {
 		UUID incompleteId = UUID.randomUUID();
 		Files.writeString(receipts, "VP-VOTE-RECEIPTS-1\n" + incompleteId + "\t9");
 
-		ProcessedVoteCache repaired = ProcessedVoteCacheAccess.create(receipts);
+		ProcessedVoteCache repaired = new ProcessedVoteCache(receipts);
 
 		assertTrue(repaired.reserve(incompleteId));
 		assertTrue(Files.readString(receipts).endsWith("\n"));
@@ -123,7 +120,7 @@ class ProcessedVoteCacheDurabilityTest {
 		Path unusableParent = directory.resolve("not-a-directory");
 		Files.writeString(unusableParent, "file");
 		UUID voteId = UUID.randomUUID();
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create(1L, unusableParent.resolve("receipts.dat"));
+		ProcessedVoteCache cache = new ProcessedVoteCache(1L, unusableParent.resolve("receipts.dat"));
 
 		assertTrue(cache.reserve(voteId));
 		assertFalse(cache.complete(voteId));
@@ -135,31 +132,31 @@ class ProcessedVoteCacheDurabilityTest {
 	void proxyConfirmedReleaseLeavesRestartSafeTombstone() {
 		Path receipts = directory.resolve("receipts.dat");
 		UUID voteId = UUID.randomUUID();
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create(receipts);
+		ProcessedVoteCache cache = new ProcessedVoteCache(receipts);
 		assertTrue(cache.reserve(voteId));
 		assertTrue(cache.complete(voteId));
 
 		assertTrue(cache.releaseCompletedReceipt(voteId));
 
-		assertFalse(ProcessedVoteCacheAccess.create(receipts).reserve(voteId));
+		assertFalse(new ProcessedVoteCache(receipts).reserve(voteId));
 	}
 
 	@Test
 	void unknownReceiptReleaseLeavesRestartSafeTombstone() {
 		Path receipts = directory.resolve("receipts.dat");
 		UUID voteId = UUID.randomUUID();
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create(receipts);
+		ProcessedVoteCache cache = new ProcessedVoteCache(receipts);
 
 		assertFalse(cache.hasDurableReceipt(voteId));
 		assertTrue(cache.releaseCompletedReceipt(voteId));
 		assertTrue(cache.hasDurableReceipt(voteId));
 
-		assertFalse(ProcessedVoteCacheAccess.create(receipts).reserve(voteId));
+		assertFalse(new ProcessedVoteCache(receipts).reserve(voteId));
 	}
 
 	@Test
 	void completionHeadroomAllowsPrecedingVotesBeforeRelease() throws Exception {
-		DurableVoteReceiptStoreAccess store = new DurableVoteReceiptStoreAccess(directory.resolve("receipts.dat"), 1, 2, 1);
+		DurableVoteReceiptStore store = new DurableVoteReceiptStore(directory.resolve("receipts.dat"), 1, 2, 1);
 		UUID first = UUID.randomUUID();
 		UUID second = UUID.randomUUID();
 		UUID third = UUID.randomUUID();
@@ -176,14 +173,14 @@ class ProcessedVoteCacheDurabilityTest {
 	@Test
 	void activeReceiptWaitsWhenTombstoneCapacityIsFull() throws Exception {
 		Path receipts = directory.resolve("receipts.dat");
-		DurableVoteReceiptStoreAccess store = new DurableVoteReceiptStoreAccess(receipts, 1, 0, 1);
+		DurableVoteReceiptStore store = new DurableVoteReceiptStore(receipts, 1, 0, 1);
 		UUID active = UUID.randomUUID();
 		assertTrue(store.complete(active) > 0L);
 		assertTrue(store.release(UUID.randomUUID()) > 0L);
 
 		assertFalse(store.release(active) > 0L);
 
-		new DurableVoteReceiptStoreAccess(receipts, 1, 0, 1);
+		new DurableVoteReceiptStore(receipts, 1, 0, 1);
 	}
 
 	@Test
@@ -192,12 +189,12 @@ class ProcessedVoteCacheDurabilityTest {
 		UUID voteId = UUID.randomUUID();
 		Files.writeString(receipts, "VP-VOTE-RECEIPTS-1\nR\t" + voteId + "\t1\n");
 
-		assertTrue(ProcessedVoteCacheAccess.create(receipts).reserve(voteId));
+		assertTrue(new ProcessedVoteCache(receipts).reserve(voteId));
 	}
 
 	@Test
 	void saturationDoesNotEvictLiveReplayFences() {
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create(TimeUnit.MINUTES.toMillis(30), 2);
+		ProcessedVoteCache cache = new ProcessedVoteCache(TimeUnit.MINUTES.toMillis(30), 2);
 		UUID first = UUID.randomUUID();
 		UUID second = UUID.randomUUID();
 
@@ -211,19 +208,19 @@ class ProcessedVoteCacheDurabilityTest {
 
 	@Test
 	void defaultCapacityIncludesDurableCompletionHeadroom() {
-		assertTrue(ProcessedVoteCacheAccess.DEFAULT_MAX_TRACKED_VOTES
-				== DurableVoteReceiptStoreAccess.MAX_ACTIVE_RECEIPTS + DurableVoteReceiptStoreAccess.COMPLETION_HEADROOM);
-		assertTrue(ProcessedVoteCacheAccess.DEFAULT_MAX_TRACKED_VOTES <= DurableVoteReceiptStoreAccess.MAX_TOTAL_RECEIPTS);
-		assertTrue((long) DurableVoteReceiptStoreAccess.MAX_TOTAL_RECEIPTS * DurableVoteReceiptStoreAccess.MAX_RECORD_BYTES
-				+ "VP-VOTE-RECEIPTS-1\n".length() <= DurableVoteReceiptStoreAccess.MAX_FILE_BYTES);
-		assertTrue((long) (DurableVoteReceiptStoreAccess.MAX_TOTAL_RECEIPTS + 1)
-				* DurableVoteReceiptStoreAccess.MAX_RECORD_BYTES + "VP-VOTE-RECEIPTS-1\n".length()
-				> DurableVoteReceiptStoreAccess.MAX_FILE_BYTES);
+		assertTrue(ProcessedVoteCache.DEFAULT_MAX_TRACKED_VOTES
+				== DurableVoteReceiptStore.MAX_ACTIVE_RECEIPTS + DurableVoteReceiptStore.COMPLETION_HEADROOM);
+		assertTrue(ProcessedVoteCache.DEFAULT_MAX_TRACKED_VOTES <= DurableVoteReceiptStore.MAX_TOTAL_RECEIPTS);
+		assertTrue((long) DurableVoteReceiptStore.MAX_TOTAL_RECEIPTS * DurableVoteReceiptStore.MAX_RECORD_BYTES
+				+ "VP-VOTE-RECEIPTS-1\n".length() <= DurableVoteReceiptStore.MAX_FILE_BYTES);
+		assertTrue((long) (DurableVoteReceiptStore.MAX_TOTAL_RECEIPTS + 1)
+				* DurableVoteReceiptStore.MAX_RECORD_BYTES + "VP-VOTE-RECEIPTS-1\n".length()
+				> DurableVoteReceiptStore.MAX_FILE_BYTES);
 	}
 
 	@Test
 	void mixedActiveAndReleaseReceiptsRespectTheJournalByteAlignedLimit() throws Exception {
-		DurableVoteReceiptStoreAccess store = new DurableVoteReceiptStoreAccess(directory.resolve("mixed-receipts.dat"), 2, 0, 2, 2);
+		DurableVoteReceiptStore store = new DurableVoteReceiptStore(directory.resolve("mixed-receipts.dat"), 2, 0, 2, 2);
 		UUID released = UUID.randomUUID();
 		UUID active = UUID.randomUUID();
 
@@ -247,7 +244,7 @@ class ProcessedVoteCacheDurabilityTest {
 				+ "R\t" + firstReleased + "\t" + expiresAt + "\n"
 				+ "R\t" + secondReleased + "\t" + expiresAt + "\n");
 
-		DurableVoteReceiptStoreAccess store = new DurableVoteReceiptStoreAccess(receipts, 2, 0, 2, 2);
+		DurableVoteReceiptStore store = new DurableVoteReceiptStore(receipts, 2, 0, 2, 2);
 
 		assertTrue(store.contains(firstActive));
 		assertTrue(store.contains(secondActive));
@@ -258,11 +255,11 @@ class ProcessedVoteCacheDurabilityTest {
 
 	@Test
 	void mixedJournalUsesDurablePerKindCapacityForNewAdmission() throws Exception {
-		DurableVoteReceiptStoreAccess store = new DurableVoteReceiptStoreAccess(directory.resolve("mixed-capacity.dat"), 2, 1, 2, 4);
+		DurableVoteReceiptStore store = new DurableVoteReceiptStore(directory.resolve("mixed-capacity.dat"), 2, 1, 2, 4);
 		assertTrue(store.release(UUID.randomUUID()) > 0L);
 		assertTrue(store.release(UUID.randomUUID()) > 0L);
 		assertTrue(store.complete(UUID.randomUUID()) > 0L);
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create(TimeUnit.MINUTES.toMillis(30), 2, store);
+		ProcessedVoteCache cache = new ProcessedVoteCache(TimeUnit.MINUTES.toMillis(30), 2, store);
 		UUID admitted = UUID.randomUUID();
 		UUID stale = UUID.randomUUID();
 		cache.getProcessedVotes().put(stale, 0L);
@@ -276,7 +273,7 @@ class ProcessedVoteCacheDurabilityTest {
 
 	@Test
 	void cancelledValidationReservationFreesCapacity() {
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create(TimeUnit.MINUTES.toMillis(30), 1);
+		ProcessedVoteCache cache = new ProcessedVoteCache(TimeUnit.MINUTES.toMillis(30), 1);
 		UUID invalid = UUID.randomUUID();
 
 		assertTrue(cache.reserve(invalid));

VotingPlugin/src/test/java/com/bencodez/votingplugin/backendproxy/global/BackendGlobalDataSyncTest.java

@@ -1,8 +1,4 @@
-package com.bencodez.votingplugin.tests.backendproxy.global;
-
-import com.bencodez.votingplugin.tests.support.ReflectiveAccess;
-
-import com.bencodez.votingplugin.backendproxy.global.BackendGlobalDataSync;
+package com.bencodez.votingplugin.backendproxy.global;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -291,7 +287,7 @@ class BackendGlobalDataSyncTest {
 		oldSync.checkGlobalData();
 		org.junit.jupiter.api.Assertions.assertEquals(1, schedulerRuns.get());
 		oldSync.handoffCompletionSender(replacement);
-		BackendGlobalDataSyncAccess.close(oldSync, 1, TimeUnit.MILLISECONDS);
+		oldSync.close(1, TimeUnit.MILLISECONDS);
 
 		replacement.checkGlobalData();
 		org.junit.jupiter.api.Assertions.assertEquals(1, schedulerRuns.get());
@@ -404,7 +400,7 @@ class BackendGlobalDataSyncTest {
 		CompletableFuture<Void> execution = CompletableFuture.runAsync(asyncWrite.get());
 		assertTrue(writeStarted.await(1, TimeUnit.SECONDS));
 		oldSync.handoffCompletionSender(replacement);
-		BackendGlobalDataSyncAccess.close(oldSync, 1, TimeUnit.MILLISECONDS);
+		oldSync.close(1, TimeUnit.MILLISECONDS);
 
 		replacement.checkGlobalData();
 		verify(replacementHandler).setBoolean("lobby", "ForceUpdate", false);
@@ -555,7 +551,7 @@ class BackendGlobalDataSyncTest {
 		setField(sync, "globalDataHandler", handler);
 		setField(sync, "ownsGlobalMysql", false);
 
-		CompletableFuture<Void> heartbeat = CompletableFuture.runAsync(() -> BackendGlobalDataSyncAccess.updateLastOnline(sync));
+		CompletableFuture<Void> heartbeat = CompletableFuture.runAsync(sync::updateLastOnline);
 		assertTrue(heartbeatStarted.await(1, TimeUnit.SECONDS));
 		CompletableFuture<Void> close = CompletableFuture.runAsync(sync::close);
 		Thread.sleep(50L);
@@ -965,7 +961,7 @@ class BackendGlobalDataSyncTest {
 		assertTrue(oldSync.checkGlobalDataTime(TimeType.DAY, data));
 		scheduled.get().run();
 		oldSync.handoffCompletionSender(replacement);
-		BackendGlobalDataSyncAccess.close(oldSync, 1, TimeUnit.MILLISECONDS);
+		oldSync.close(1, TimeUnit.MILLISECONDS);
 		replacement.checkGlobalData();
 
 		verify(timeChecker).forceChanged(TimeType.DAY, false, true, true);
@@ -1087,7 +1083,7 @@ class BackendGlobalDataSyncTest {
 		week.put(TimeType.WEEK.toString(), new DataValueBoolean(true));
 
 		assertTrue(oldSync.checkGlobalDataTime(TimeType.DAY, day));
-		BackendGlobalDataSyncAccess.close(oldSync, 1, TimeUnit.MILLISECONDS);
+		oldSync.close(1, TimeUnit.MILLISECONDS);
 		assertFalse(replacement.checkGlobalDataTime(TimeType.DAY, day));
 		assertTrue(replacement.checkGlobalDataTime(TimeType.WEEK, week));
 		org.junit.jupiter.api.Assertions.assertEquals(2, scheduled.size());
@@ -1128,7 +1124,7 @@ class BackendGlobalDataSyncTest {
 		week.put(TimeType.WEEK.toString(), new DataValueBoolean(true));
 
 		assertTrue(oldSync.checkGlobalDataTime(TimeType.DAY, day));
-		BackendGlobalDataSyncAccess.close(oldSync, 1, TimeUnit.MILLISECONDS);
+		oldSync.close(1, TimeUnit.MILLISECONDS);
 		BackendGlobalDataSync replacement = new BackendGlobalDataSync(plugin, ignored -> { });
 		setField(replacement, "globalDataHandler", replacementHandler);
 
@@ -1223,7 +1219,7 @@ class BackendGlobalDataSyncTest {
 				() -> sync.checkGlobalDataTime(TimeType.DAY, data));
 		assertTrue(writeStarted.await(1, TimeUnit.SECONDS));
 
-		BackendGlobalDataSyncAccess.close(sync, 50L, TimeUnit.MILLISECONDS);
+		sync.close(50L, TimeUnit.MILLISECONDS);
 		verify(mysql).close();
 
 		releaseWrite.countDown();
@@ -1243,7 +1239,7 @@ class BackendGlobalDataSyncTest {
 		setField(sync, "globalDataHandler", handler);
 		setField(sync, "ownsGlobalMysql", false);
 
-		BackendGlobalDataSyncAccess.close(sync);
+		sync.close();
 
 		verify(mysql, never()).close();
 	}
@@ -1258,7 +1254,7 @@ class BackendGlobalDataSyncTest {
 		setField(sync, "globalDataHandler", handler);
 		setField(sync, "ownsGlobalMysql", true);
 
-		BackendGlobalDataSyncAccess.close(sync);
+		sync.close();
 
 		verify(mysql).close();
 	}
@@ -1267,7 +1263,7 @@ class BackendGlobalDataSyncTest {
 		try {
 			Field field = BackendGlobalDataSync.class.getDeclaredField(fieldName);
 			field.setAccessible(true);
-			ReflectiveAccess.set(field, target, value);
+			field.set(target, value);
 		} catch (ReflectiveOperationException failure) {
 			throw new AssertionError(failure);
 		}

VotingPlugin/src/test/java/com/bencodez/votingplugin/backendproxy/messaging/BackendProxyMessageRouterTest.java

@@ -1,6 +1,4 @@
-package com.bencodez.votingplugin.tests.backendproxy.messaging;
-
-import com.bencodez.votingplugin.backendproxy.messaging.BackendProxyMessageRouter;
+package com.bencodez.votingplugin.backendproxy.messaging;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -116,7 +114,7 @@ class BackendProxyMessageRouterTest {
 
 	@Test
 	void ignoresLastVoteTimeForUnknownServiceSite() {
-		BackendProxyMessageRouterAccess.handleVoteUpdate(router, VotingPluginWire.voteUpdate(PLAYER_UUID.toString(), 1, 10,
+		router.handleVoteUpdate(VotingPluginWire.voteUpdate(PLAYER_UUID.toString(), 1, 10,
 				"unknown.example\nforged-entry", LAST_VOTE_TIME, ""));
 
 		verify(user, times(2)).cache();
@@ -132,7 +130,7 @@ class BackendProxyMessageRouterTest {
 		VoteSite voteSite = mock(VoteSite.class);
 		when(voteSiteManager.getVoteSite("known.example", true)).thenReturn(voteSite);
 
-		BackendProxyMessageRouterAccess.handleVoteUpdate(router, VotingPluginWire.voteUpdate(PLAYER_UUID.toString(), 1, 10,
+		router.handleVoteUpdate(VotingPluginWire.voteUpdate(PLAYER_UUID.toString(), 1, 10,
 				"known.example", LAST_VOTE_TIME, ""));
 
 		verify(user, times(2)).cache();
@@ -789,7 +787,7 @@ class BackendProxyMessageRouterTest {
 		}).when(coreUserManager).getUserAsync(eq(PLAYER_UUID), any(), any());
 
 		AtomicInteger completions = new AtomicInteger();
-		BackendProxyMessageRouterAccess.handleVoteUpdate(router, VotingPluginWire.voteUpdate(PLAYER_UUID.toString(), 1, 10,
+		router.handleVoteUpdate(VotingPluginWire.voteUpdate(PLAYER_UUID.toString(), 1, 10,
 				"known.example", LAST_VOTE_TIME, ""), completions::incrementAndGet);
 
 		assertEquals(1, completions.get());
@@ -840,38 +838,6 @@ class BackendProxyMessageRouterTest {
 		verify(user, never()).setTime(any(), anyLong());
 	}
 
-    @Test
-    void actualAccountingDispatchFailureQuarantinesOriginalIdAndNeverReplaysNormalProcessing() throws Exception {
-        UUID voteId = UUID.randomUUID();
-        ProcessedVoteCache cache = mock(ProcessedVoteCache.class);
-        when(cache.reserveWithOutcome(voteId)).thenReturn(Reservation.RESERVED, Reservation.DUPLICATE);
-        var dispatchPlugin = mock(VotingPluginMain.class, org.mockito.Mockito.RETURNS_DEEP_STUBS);
-        when(dispatchPlugin.getBungeeSettings().isUseBungeecoord()).thenReturn(true);
-        var dispatchUser = mock(VotingPluginUser.class, org.mockito.Mockito.CALLS_REAL_METHODS);
-        var field = VotingPluginUser.class.getDeclaredField("plugin"); field.setAccessible(true); field.set(dispatchUser, dispatchPlugin);
-        org.mockito.Mockito.doReturn("Player").when(dispatchUser).getPlayerName();
-        var dispatcher = dispatchPlugin.getServer().getPluginManager();
-        org.mockito.Mockito.doAnswer(call -> { ((com.bencodez.votingplugin.events.PlayerVoteEvent) call.getArgument(0)).setDateMilestoneAccountingFailed(true); return null; })
-                .when(dispatcher).callEvent(any());
-        when(plugin.getBungeeSettings()).thenReturn(mock(BungeeSettings.class));
-        when(plugin.getServerData()).thenReturn(mock(ServerData.class));
-        when(plugin.getVotingPluginUserManager().getVotingPluginUser(PLAYER_UUID, "Player")).thenReturn(user);
-        org.mockito.Mockito.doAnswer(call -> {
-            return dispatchUser.bungeeVotePluginMessagingEvent(call.getArgument(0), call.getArgument(1), call.getArgument(2),
-                    call.getArgument(3), call.getArgument(4), call.getArgument(5), call.getArgument(6), call.getArgument(7),
-                    call.getArgument(8), call.getArgument(9), call.getArgument(10), call.getArgument(11), call.getArgument(12), call.getArgument(13));
-        }).when(user).bungeeVotePluginMessagingEvent(any(), anyLong(), any(), anyBoolean(), anyBoolean(), anyBoolean(),
-                anyInt(), anyBoolean(), anyBoolean(), anyBoolean(), any(), anyBoolean(), anyBoolean(), anyLong());
-        var router = new BackendProxyMessageRouter(plugin, mock(BackendPresenceManager.class), mock(BackendGlobalDataSync.class), mock(BackendVotePartySync.class), cache);
-        var envelope = VotingPluginWire.requestVoteDeliveryAcknowledgement(VotingPluginWire.vote("Player", PLAYER_UUID.toString(), "known.example", LAST_VOTE_TIME, true, true, "", voteId, false, false, 1, 1));
-        AtomicReference<OrderedVoteOutcome> outcome = new AtomicReference<>();
-        assertThrows(IllegalStateException.class, () -> router.handleOrderedVote(envelope, outcome::set));
-        assertEquals(OrderedVoteOutcome.QUARANTINE, outcome.get()); outcome.set(null);
-        router.handleOrderedVote(envelope, outcome::set); assertEquals(OrderedVoteOutcome.QUARANTINE, outcome.get());
-        verify(cache, never()).complete(voteId); verify(dispatchPlugin.getServer().getPluginManager(), times(1)).callEvent(any());
-        verify(plugin.getServerData(), times(1)).addServiceSite("known.example");
-    }
-
 	@Test
 	void proxyCancellationSuppressesPerServerPointsAndCompletesWithoutReplayingRejectedVotes() throws Exception {
         for (boolean cancelled : new boolean[] {false, true}) {
@@ -889,7 +855,7 @@ class BackendProxyMessageRouterTest {
             var field = VotingPluginUser.class.getDeclaredField("plugin"); field.setAccessible(true); field.set(user, plugin);
             org.mockito.Mockito.doCallRealMethod().when(user).bungeeVotePluginMessagingEvent(
                     any(), anyLong(), any(), anyBoolean(), anyBoolean(), anyBoolean(), anyInt(), anyBoolean(),
-                    anyBoolean(), anyBoolean(), any(), anyBoolean(), anyBoolean(), anyLong());
+                    anyBoolean(), anyBoolean(), any(), anyBoolean());
             var server = mock(org.bukkit.Server.class);
             var manager = mock(org.bukkit.plugin.PluginManager.class);
             when(plugin.getServer()).thenReturn(server); when(server.getPluginManager()).thenReturn(manager);
@@ -929,7 +895,7 @@ class BackendProxyMessageRouterTest {
 				.thenReturn(user);
 		doThrow(new IllegalStateException("partial reward")).when(user).bungeeVotePluginMessagingEvent(
 				any(), anyLong(), any(), anyBoolean(), anyBoolean(), anyBoolean(), anyInt(), anyBoolean(), anyBoolean(),
-				anyBoolean(), any(), anyBoolean(), anyBoolean(), anyLong());
+				anyBoolean(), any(), anyBoolean());
 		BackendProxyMessageRouter voteRouter = new BackendProxyMessageRouter(plugin,
 				mock(BackendPresenceManager.class), mock(BackendGlobalDataSync.class),
 				mock(BackendVotePartySync.class), cache);
@@ -975,7 +941,7 @@ class BackendProxyMessageRouterTest {
 		assertEquals(OrderedVoteOutcome.COMPLETE, outcome.get());
 		verify(cache, times(2)).complete(voteId);
 		verify(user, times(1)).bungeeVotePluginMessagingEvent(any(), anyLong(), any(), anyBoolean(), anyBoolean(),
-				anyBoolean(), anyInt(), eq(false), eq(true), eq(true), eq(voteId), eq(false), anyBoolean(), anyLong());
+				anyBoolean(), anyInt(), eq(false), eq(true), eq(true), eq(voteId), eq(false));
 	}
 
 	@Test
@@ -996,24 +962,7 @@ class BackendProxyMessageRouterTest {
 				LAST_VOTE_TIME, true, true, "", voteId, false, false, 1, 1), ignored -> { });
 
 		verify(user).bungeeVotePluginMessagingEvent(any(), anyLong(), any(), anyBoolean(), anyBoolean(),
-				anyBoolean(), anyInt(), eq(false), eq(false), eq(true), eq(voteId), eq(false), anyBoolean(), anyLong());
-	}
-
-	@Test
-	void canonicalTestVoteFlagIsPassedToTheBackendEventAdapter() {
-		UUID voteId = UUID.randomUUID();
-		ProcessedVoteCache cache = mock(ProcessedVoteCache.class);
-		when(cache.reserveWithOutcome(voteId)).thenReturn(Reservation.RESERVED);
-		when(plugin.getBungeeSettings()).thenReturn(mock(BungeeSettings.class));
-		when(plugin.getVotingPluginUserManager().getVotingPluginUser(PLAYER_UUID, "Player")).thenReturn(user);
-		when(plugin.getServerData()).thenReturn(mock(ServerData.class));
-		BackendProxyMessageRouter voteRouter = new BackendProxyMessageRouter(plugin,
-				mock(BackendPresenceManager.class), mock(BackendGlobalDataSync.class),
-				mock(BackendVotePartySync.class), cache);
-		voteRouter.handleOrderedVote(VotingPluginWire.vote("Player", PLAYER_UUID.toString(), "known.example",
-				LAST_VOTE_TIME, true, false, "", voteId, false, false, 1, 1), ignored -> { });
-		verify(user).bungeeVotePluginMessagingEvent(any(), anyLong(), any(), anyBoolean(), anyBoolean(),
-				anyBoolean(), anyInt(), anyBoolean(), anyBoolean(), anyBoolean(), eq(voteId), eq(false), eq(false), anyLong());
+				anyBoolean(), anyInt(), eq(false), eq(false), eq(true), eq(voteId), eq(false));
 	}
 
 	@Test
@@ -1033,7 +982,7 @@ class BackendProxyMessageRouterTest {
 				LAST_VOTE_TIME, true, true, "", voteId, false, false, 1, 1), ignored -> { });
 
 		verify(user).bungeeVotePluginMessagingEvent(any(), anyLong(), any(), anyBoolean(), anyBoolean(),
-				anyBoolean(), anyInt(), anyBoolean(), anyBoolean(), anyBoolean(), eq(voteId), eq(true), anyBoolean(), anyLong());
+				anyBoolean(), anyInt(), anyBoolean(), anyBoolean(), anyBoolean(), eq(voteId), eq(true));
 	}
 
 	@Test
@@ -1055,7 +1004,7 @@ class BackendProxyMessageRouterTest {
 		assertEquals(OrderedVoteOutcome.QUARANTINE, outcome.get());
 		verify(cache, never()).complete(voteId);
 		verify(user, never()).bungeeVotePluginMessagingEvent(any(), anyLong(), any(), anyBoolean(), anyBoolean(),
-				anyBoolean(), anyInt(), anyBoolean(), anyBoolean(), anyBoolean(), any(), anyBoolean(), anyBoolean(), anyLong());
+				anyBoolean(), anyInt(), anyBoolean(), anyBoolean(), anyBoolean(), any(), anyBoolean());
 		verify(cache).cancelReservation(voteId);
 	}
 
@@ -1075,7 +1024,7 @@ class BackendProxyMessageRouterTest {
 
 		assertEquals(OrderedVoteOutcome.RETRY, outcome.get());
 		verify(user, never()).bungeeVotePluginMessagingEvent(any(), anyLong(), any(), anyBoolean(), anyBoolean(),
-				anyBoolean(), anyInt(), anyBoolean(), anyBoolean(), anyBoolean(), any(), anyBoolean(), anyBoolean(), anyLong());
+				anyBoolean(), anyInt(), anyBoolean(), anyBoolean(), anyBoolean(), any(), anyBoolean());
 		verify(cache, never()).complete(voteId);
 	}
 
@@ -1298,7 +1247,7 @@ class BackendProxyMessageRouterTest {
 		voteRouter.handleOrderedVote(queued, ignored -> { });
 
 		verify(user).bungeeVotePluginMessagingEvent(any(), anyLong(), any(), anyBoolean(), anyBoolean(),
-				anyBoolean(), anyInt(), eq(true), eq(true), eq(true), eq(voteId), eq(true), anyBoolean(), anyLong());
+				anyBoolean(), anyInt(), eq(true), eq(true), eq(true), eq(voteId), eq(true));
 	}
 
 	@Test

VotingPlugin/src/test/java/com/bencodez/votingplugin/backendproxy/messaging/BackendProxyVoteDelayReplayTest.java

@@ -1,8 +1,4 @@
-package com.bencodez.votingplugin.tests.backendproxy.messaging;
-
-import com.bencodez.votingplugin.tests.backendproxy.cache.ProcessedVoteCacheAccess;
-
-import com.bencodez.votingplugin.backendproxy.messaging.BackendProxyMessageRouter;
+package com.bencodez.votingplugin.backendproxy.messaging;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -96,7 +92,7 @@ class BackendProxyVoteDelayReplayTest {
             fixture.assertEffects(1);
             fixture.assertOccurrence(0, voteId, RECORDED_TIME - 60_000L);
             verify(fixture.site, never()).giveWaitUntilVoteDelayRewards(any(), anyBoolean(), anyBoolean());
-            assertTrue(ProcessedVoteCacheAccess.create(fixture.receipts).hasDurableReceipt(voteId));
+            assertTrue(new ProcessedVoteCache(fixture.receipts).hasDurableReceipt(voteId));
         });
     }
 
@@ -266,9 +262,7 @@ class BackendProxyVoteDelayReplayTest {
             pluginField.set(user, plugin);
             doCallRealMethod().when(user).bungeeVotePluginMessagingEvent(any(), anyLong(), any(VoteTotalsSnapshot.class),
                     anyBoolean(), anyBoolean(), anyBoolean(), anyInt(), anyBoolean(), anyBoolean(),
-                    anyBoolean(), any(), anyBoolean(), anyBoolean(), anyLong());
-            when(plugin.getDateVoteMilestones()).thenReturn(
-                    new com.bencodez.votingplugin.specialrewards.datemilestones.DateVoteMilestones(plugin));
+                    anyBoolean(), any(), anyBoolean());
             PlayerVoteListener listener = new PlayerVoteListener(plugin);
             var eventManager = plugin.getServer().getPluginManager();
             doAnswer(call -> {
@@ -283,7 +277,7 @@ class BackendProxyVoteDelayReplayTest {
         private void restartReceiver() {
             router = new BackendProxyMessageRouter(plugin, mock(BackendPresenceManager.class),
                     mock(BackendGlobalDataSync.class), mock(BackendVotePartySync.class),
-                    ProcessedVoteCacheAccess.create(receipts));
+                    new ProcessedVoteCache(receipts));
         }
 
         private void deliver(JsonEnvelope envelope) {

VotingPlugin/src/test/java/com/bencodez/votingplugin/backendproxy/transport/HttpBackendProxyTransportTest.java

@@ -1,10 +1,4 @@
-package com.bencodez.votingplugin.tests.backendproxy.transport;
-
-import com.bencodez.votingplugin.tests.support.ReflectiveAccess;
-
-import com.bencodez.votingplugin.backendproxy.transport.BackendProxyTransport;
-import com.bencodez.votingplugin.backendproxy.transport.BackendProxyTransportManager;
-import com.bencodez.votingplugin.backendproxy.transport.HttpBackendProxyTransport;
+package com.bencodez.votingplugin.backendproxy.transport;
 
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -70,7 +64,7 @@ class HttpBackendProxyTransportTest {
 		}).when(scheduler).runTask(org.mockito.ArgumentMatchers.eq(plugin), org.mockito.ArgumentMatchers.any(Runnable.class));
 		JsonEnvelope envelope = JsonEnvelope.builder("test").put("message", "payload").build();
 
-		HttpBackendProxyTransportAccess.dispatchIncoming(new HttpBackendProxyTransport(plugin), handler, envelope,
+		new HttpBackendProxyTransport(plugin).dispatchIncoming(handler, envelope,
 				System.nanoTime() + TimeUnit.SECONDS.toNanos(1));
 
 		assertTrue(callbackFinished.await(1, TimeUnit.SECONDS));
@@ -79,7 +73,7 @@ class HttpBackendProxyTransportTest {
 
 	@Test
 	void publicationActivatesTheSimpleApiInboundBarrier() throws Exception {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		HttpBackendTransportConnector connector = mock(HttpBackendTransportConnector.class);
 		setField(transport, "connector", connector);
 
@@ -90,10 +84,10 @@ class HttpBackendProxyTransportTest {
 
 	@Test
 	void closedPublicationGateRejectsDeliveryForReplay() {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		transport.close();
 
-		assertThrows(IllegalStateException.class, () -> HttpBackendProxyTransportAccess.dispatchAfterPublication(transport,
+		assertThrows(IllegalStateException.class, () -> transport.dispatchAfterPublication(
 				mock(GlobalMessageHandler.class), JsonEnvelope.builder("test").build()));
 	}
 
@@ -104,7 +98,7 @@ class HttpBackendProxyTransportTest {
 		when(connector.send(pending)).thenReturn(false, true);
 		when(connector.flushOutgoing(org.mockito.ArgumentMatchers.anyLong())).thenReturn(true);
 
-		assertTrue(HttpBackendProxyTransportAccess.flushHandoffForShutdown(connector, List.of(pending),
+		assertTrue(HttpBackendProxyTransport.flushHandoffForShutdown(connector, List.of(pending),
 				System.nanoTime() + TimeUnit.SECONDS.toNanos(1)));
 
 		org.mockito.InOrder order = org.mockito.Mockito.inOrder(connector);
@@ -115,7 +109,7 @@ class HttpBackendProxyTransportTest {
 	@Test
 	@SuppressWarnings("unchecked")
 	void unpublishedHandoffMessagesAreDiscardedOnRollback() throws Exception {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		HttpBackendTransportConnector connector = mock(HttpBackendTransportConnector.class);
 		setField(transport, "connector", connector);
 		((java.util.ArrayDeque<JsonEnvelope>) field(transport, "handoffQueue"))
@@ -136,7 +130,7 @@ class HttpBackendProxyTransportTest {
 		when(connector.send(pending)).thenReturn(false);
 
 		assertThrows(IllegalStateException.class,
-				() -> HttpBackendProxyTransportAccess.transferStartupQueue(queue, connector));
+				() -> HttpBackendProxyTransport.transferStartupQueue(queue, connector));
 		assertEquals(java.util.List.of(pending), new java.util.ArrayList<>(queue));
 	}
 
@@ -148,7 +142,7 @@ class HttpBackendProxyTransportTest {
 		CountDownLatch completion = new CountDownLatch(1);
 
 		assertThrows(IllegalStateException.class,
-				() -> HttpBackendProxyTransportAccess.finishInitialization(false, connector, true, owner, completion));
+				() -> HttpBackendProxyTransport.finishInitialization(false, connector, true, owner, completion));
 
 		verify(connector).close();
 		assertEquals(1, owner.availablePermits());
@@ -158,7 +152,7 @@ class HttpBackendProxyTransportTest {
 	@Test
 	@SuppressWarnings("unchecked")
 	void orderlyShutdownFlushesRecoveryQueueBeforeHandoffQueue() throws Exception {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		HttpBackendTransportConnector connector = mock(HttpBackendTransportConnector.class);
 		JsonEnvelope recovery = JsonEnvelope.builder("recovery").build();
 		JsonEnvelope handoff = JsonEnvelope.builder("handoff").build();
@@ -187,8 +181,8 @@ class HttpBackendProxyTransportTest {
 		setField(manager, "transport", failed);
 		org.mockito.Mockito.doThrow(new IllegalStateException("worker still stopping"))
 				.when(failed).prepareForReplacement();
-		when(HttpBackendProxyTransportAccess.isClosedForReplacement(failed)).thenReturn(true);
-		when(HttpBackendProxyTransportAccess.recreatePrepared(failed)).thenReturn(restored);
+		when(failed.isClosedForReplacement()).thenReturn(true);
+		when(failed.recreatePrepared()).thenReturn(restored);
 
 		assertThrows(IllegalStateException.class, manager::prepareForReplacement);
 		manager.send(queued);
@@ -209,7 +203,7 @@ class HttpBackendProxyTransportTest {
 		manager.send(queued);
 
 		verify(active).send(queued);
-		HttpBackendProxyTransportAccess.recreatePrepared(verify(active, org.mockito.Mockito.never()));
+		verify(active, org.mockito.Mockito.never()).recreatePrepared();
 	}
 
 	@Test
@@ -273,7 +267,7 @@ class HttpBackendProxyTransportTest {
 		});
 
 		assertThrows(IllegalStateException.class,
-				() -> HttpBackendProxyTransportAccess.dispatchIncoming(new HttpBackendProxyTransport(plugin), handler,
+				() -> new HttpBackendProxyTransport(plugin).dispatchIncoming(handler,
 						JsonEnvelope.builder("test").build(), System.nanoTime()));
 		assertTrue(scheduled.get() != null);
 		scheduled.get().run();
@@ -300,7 +294,7 @@ class HttpBackendProxyTransportTest {
 		AtomicReference<Throwable> dispatchFailure = new AtomicReference<>();
 		Thread dispatch = new Thread(() -> {
 			try {
-				HttpBackendProxyTransportAccess.dispatchIncoming(new HttpBackendProxyTransport(plugin), handler,
+				new HttpBackendProxyTransport(plugin).dispatchIncoming(handler,
 						JsonEnvelope.builder("test").build(), System.nanoTime() + TimeUnit.SECONDS.toNanos(5));
 			} catch (Throwable thrown) {
 				dispatchFailure.set(thrown);
@@ -323,28 +317,28 @@ class HttpBackendProxyTransportTest {
 		when(plugin.getDataFolder()).thenReturn(directory.toFile());
 		when(plugin.getBungeeSettings()).thenReturn(settings);
 		when(settings.getServer()).thenReturn("lobby-1");
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(plugin);
 
 		when(settings.getHttpConnectionCode()).thenReturn("malformed");
-		assertThrows(IllegalStateException.class, () -> HttpBackendProxyTransportAccess.validate(transport));
+		assertThrows(IllegalStateException.class, transport::validate);
 
 		when(settings.getHttpConnectionCode()).thenReturn(code("lobby-1", Instant.now().minusSeconds(1)).encode());
-		assertThrows(IllegalStateException.class, () -> HttpBackendProxyTransportAccess.validate(transport));
+		assertThrows(IllegalStateException.class, transport::validate);
 
 		when(settings.getHttpConnectionCode()).thenReturn(code("survival", Instant.now().plusSeconds(60)).encode());
-		assertThrows(IllegalStateException.class, () -> HttpBackendProxyTransportAccess.validate(transport));
+		assertThrows(IllegalStateException.class, transport::validate);
 		assertThrows(IllegalStateException.class, () -> transport.start(mock(GlobalMessageHandler.class)),
 				"invalid configuration must fail before the enrollment worker starts");
 
 		when(settings.getHttpConnectionCode()).thenReturn(code("lobby-1", Instant.now().plusSeconds(60)).encode());
-		assertDoesNotThrow(() -> HttpBackendProxyTransportAccess.validate(transport));
+		assertDoesNotThrow(() -> transport.validate());
 	}
 
 	@Test
 	void ordinaryStartupRetriesTransientInitialEnrollmentWithBoundedBackoff() throws Exception {
 		VotingPluginMain plugin = mock(VotingPluginMain.class);
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(plugin);
 		HttpConnectionCode enrollment = code("lobby-1", Instant.now().plusSeconds(60));
 		List<Long> delays = new ArrayList<>();
 		java.util.concurrent.atomic.AtomicInteger attempts = new java.util.concurrent.atomic.AtomicInteger();
@@ -355,7 +349,7 @@ class HttpBackendProxyTransportTest {
 						if (attempts.getAndIncrement() == 0) throw new IOException("proxy unavailable");
 						return null;
 					});
-			assertTrue(HttpBackendProxyTransportAccess.enrollForStartup(transport, enrollment, "lobby-1", directory, true,
+			assertTrue(transport.enrollForStartup(enrollment, "lobby-1", directory, true,
 					delay -> { delays.add(delay); return true; }));
 		}
 
@@ -365,11 +359,11 @@ class HttpBackendProxyTransportTest {
 
 	@Test
 	void replacementCancelsRetryingInitialEnrollmentWithoutCredential() throws Exception {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		Path credentials = directory.resolve("http");
 		java.lang.reflect.Field directoryField = HttpBackendProxyTransport.class.getDeclaredField("configuredDirectory");
 		directoryField.setAccessible(true);
-		ReflectiveAccess.set(directoryField, transport, credentials);
+		directoryField.set(transport, credentials);
 		java.lang.reflect.Field ownersField = HttpBackendProxyTransport.class.getDeclaredField("DIRECTORY_OWNERS");
 		ownersField.setAccessible(true);
 		@SuppressWarnings("unchecked")
@@ -386,7 +380,7 @@ class HttpBackendProxyTransportTest {
 		});
 		java.lang.reflect.Field workerField = HttpBackendProxyTransport.class.getDeclaredField("worker");
 		workerField.setAccessible(true);
-		ReflectiveAccess.set(workerField, transport, retryingEnrollment);
+		workerField.set(transport, retryingEnrollment);
 		retryingEnrollment.start();
 		assertTrue(workerStarted.await(1, TimeUnit.SECONDS));
 		JsonEnvelope queued = JsonEnvelope.builder("queued-before-replacement").build();
@@ -398,7 +392,7 @@ class HttpBackendProxyTransportTest {
 				HttpBackendProxyTransport.class.getDeclaredField("restoreUnenrolledState");
 		restoreAbsent.setAccessible(true);
 		assertTrue(restoreAbsent.getBoolean(transport), "rollback must remember that no credential existed");
-		assertEquals(List.of(queued), HttpBackendProxyTransportAccess.drainPreparedMessages(transport),
+		assertEquals(List.of(queued), transport.drainPreparedMessages(),
 				"messages accepted before replacement must remain available for handoff");
 
 		long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(2);
@@ -410,7 +404,7 @@ class HttpBackendProxyTransportTest {
 
 	@Test
 	void replacementSnapshotsInitialEnrollmentPublishedWhileCancellationCompletes() throws Exception {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		Path credentials = directory.resolve("http");
 		HttpTlsIdentity identity = HttpTlsIdentity.loadOrCreate(directory.resolve("original-proxy"),
 				"proxy.example.test");
@@ -457,7 +451,7 @@ class HttpBackendProxyTransportTest {
 		assertTrue(HttpClientCredentialStore.hasEnrolledProfile(credentials));
 
 		HttpConnectionCode original = code("lobby-1", Instant.now().plusSeconds(60));
-		HttpBackendProxyTransportAccess.restoreUnenrolledCredentialState(credentials, "lobby-1", original.encode());
+		HttpBackendProxyTransport.restoreUnenrolledCredentialState(credentials, "lobby-1", original.encode());
 
 		assertFalse(HttpClientCredentialStore.hasEnrolledProfile(credentials),
 				"a failed staged first enrollment must not remain active during rollback");
@@ -472,7 +466,7 @@ class HttpBackendProxyTransportTest {
 				identity.serverCertificatePin(), identity.caCertificatePin(), Instant.now().plusSeconds(60), "F".repeat(43));
 		HttpClientCredentialStore.saveEnrolled(credentials, original, identity.issueClientCertificate("lobby-1"));
 
-		HttpBackendProxyTransportAccess.restoreUnenrolledCredentialState(credentials, "lobby-1", original.encode());
+		HttpBackendProxyTransport.restoreUnenrolledCredentialState(credentials, "lobby-1", original.encode());
 
 		assertTrue(HttpClientCredentialStore.hasEnrolledProfile(credentials),
 				"a credential issued for the consumed original code must remain recoverable");
@@ -482,13 +476,13 @@ class HttpBackendProxyTransportTest {
 	void stagedEnrollmentRemainsFailFast() throws Exception {
 		VotingPluginMain plugin = mock(VotingPluginMain.class);
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(plugin);
 		HttpConnectionCode enrollment = code("lobby-1", Instant.now().plusSeconds(60));
 		try (MockedStatic<HttpBackendTransportConnector> connector = org.mockito.Mockito.mockStatic(HttpBackendTransportConnector.class)) {
 			connector.when(() -> HttpBackendTransportConnector.enroll(enrollment, "lobby-1", directory))
 					.thenThrow(new IOException("proxy unavailable"));
 			assertThrows(IOException.class,
-					() -> HttpBackendProxyTransportAccess.enrollForStartup(transport, enrollment, "lobby-1", directory, false,
+					() -> transport.enrollForStartup(enrollment, "lobby-1", directory, false,
 							delay -> { throw new AssertionError("staged enrollment must not retry"); }));
 		}
 	}
@@ -500,32 +494,32 @@ class HttpBackendProxyTransportTest {
 		HttpConnectionCode original = new HttpConnectionCode("lobby-1", URI.create("https://proxy.example.test:1297/"),
 				identity.serverCertificatePin(), identity.caCertificatePin(), Instant.now().minusSeconds(1), "A".repeat(43));
 		HttpClientCredentialStore.saveEnrolled(credentials, original, identity.issueClientCertificate("lobby-1"));
-		assertNull(HttpBackendProxyTransportAccess.enrollmentCode(credentials, "lobby-1", ""));
-		assertNull(HttpBackendProxyTransportAccess.enrollmentCode(credentials, "lobby-1", original.encode()),
+		assertNull(HttpBackendProxyTransport.enrollmentCode(credentials, "lobby-1", ""));
+		assertNull(HttpBackendProxyTransport.enrollmentCode(credentials, "lobby-1", original.encode()),
 				"the already-consumed code must not be retried, even after it expires");
 
 		HttpConnectionCode replacement = new HttpConnectionCode("lobby-1", original.endpoint(), original.serverCertificatePin(),
 				original.caCertificatePin(), Instant.now().plusSeconds(60), "B".repeat(43));
-		assertEquals(replacement.encode(), HttpBackendProxyTransportAccess.enrollmentCode(credentials, "lobby-1", replacement.encode()).encode());
+		assertEquals(replacement.encode(), HttpBackendProxyTransport.enrollmentCode(credentials, "lobby-1", replacement.encode()).encode());
 		assertThrows(IllegalStateException.class,
-				() -> HttpBackendProxyTransportAccess.enrollmentCode(credentials, "lobby-1", "malformed"));
+				() -> HttpBackendProxyTransport.enrollmentCode(credentials, "lobby-1", "malformed"));
 	}
 
 	@Test
 	void failedReplacementFlushResumesTheExistingConnector() {
 		HttpBackendTransportConnector connector = mock(HttpBackendTransportConnector.class);
 		when(connector.flushOutgoing(org.mockito.ArgumentMatchers.anyLong())).thenReturn(false);
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 
 		assertThrows(IllegalStateException.class,
-				() -> HttpBackendProxyTransportAccess.flushForReplacement(transport, connector, System.nanoTime()));
+				() -> transport.flushForReplacement(connector, System.nanoTime()));
 
 		verify(connector).start();
 	}
 
 	@Test
 	void closeNeverWaitsForSetupOnTheCallingThread() throws Exception {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		CountDownLatch started = new CountDownLatch(1), release = new CountDownLatch(1);
 		Thread blocked = new Thread(() -> {
 			started.countDown();
@@ -536,7 +530,7 @@ class HttpBackendProxyTransportTest {
 		assertTrue(started.await(1, TimeUnit.SECONDS));
 		java.lang.reflect.Field worker = HttpBackendProxyTransport.class.getDeclaredField("worker");
 		worker.setAccessible(true);
-		ReflectiveAccess.set(worker, transport, blocked);
+		worker.set(transport, blocked);
 
 		long startedAt = System.nanoTime();
 		transport.close();
@@ -547,7 +541,7 @@ class HttpBackendProxyTransportTest {
 
 	@Test
 	void prepareForReplacementSnapshotsThePersistedCredentialGeneration() throws Exception {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		Path credentials = directory.resolve("http");
 		HttpTlsIdentity identity = HttpTlsIdentity.loadOrCreate(directory.resolve("replacement-proxy"), "proxy.example.test");
 		HttpConnectionCode code = new HttpConnectionCode("lobby-1", URI.create("https://proxy.example.test:1297/"),
@@ -557,12 +551,12 @@ class HttpBackendProxyTransportTest {
 				HttpClientCredentialStore.snapshotActiveGeneration(credentials);
 		java.lang.reflect.Field directoryField = HttpBackendProxyTransport.class.getDeclaredField("configuredDirectory");
 		directoryField.setAccessible(true);
-		ReflectiveAccess.set(directoryField, transport, credentials);
+		directoryField.set(transport, credentials);
 		java.lang.reflect.Field connectorField = HttpBackendProxyTransport.class.getDeclaredField("connector");
 		connectorField.setAccessible(true);
 		HttpBackendTransportConnector connector = mock(HttpBackendTransportConnector.class);
 		when(connector.flushOutgoing(org.mockito.ArgumentMatchers.anyLong())).thenReturn(true);
-		ReflectiveAccess.set(connectorField, transport, connector);
+		connectorField.set(transport, connector);
 
 		assertDoesNotThrow(transport::prepareForReplacement);
 		java.lang.reflect.Field generationField =
@@ -591,12 +585,12 @@ class HttpBackendProxyTransportTest {
 		var owners = (java.util.concurrent.ConcurrentHashMap<Path, java.util.concurrent.Semaphore>) ownersField.get(null);
 		java.util.concurrent.Semaphore predecessor = new java.util.concurrent.Semaphore(0);
 		owners.put(credentials.toAbsolutePath().normalize(), predecessor);
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(plugin);
 		transport.start(mock(GlobalMessageHandler.class));
 		java.util.concurrent.atomic.AtomicReference<Throwable> failure = new java.util.concurrent.atomic.AtomicReference<>();
 		CountDownLatch finished = new CountDownLatch(1);
 		Thread validation = new Thread(() -> {
-			try { HttpBackendProxyTransportAccess.validate(transport, System.nanoTime() + TimeUnit.SECONDS.toNanos(1)); }
+			try { transport.validate(System.nanoTime() + TimeUnit.SECONDS.toNanos(1)); }
 			catch (Throwable thrown) { failure.set(thrown); }
 			finally { finished.countDown(); }
 		});
@@ -617,32 +611,32 @@ class HttpBackendProxyTransportTest {
 	void preparedHandoffMessagesStayAheadOfNewlyPublishedSendsWhenConnectorIsFull() throws Exception {
 		VotingPluginMain plugin = mock(VotingPluginMain.class);
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(plugin);
 		HttpBackendTransportConnector connector = mock(HttpBackendTransportConnector.class);
 		when(connector.send(org.mockito.ArgumentMatchers.any(JsonEnvelope.class))).thenReturn(false);
 		setField(transport, "connector", connector);
 		JsonEnvelope acceptedBeforePublication = JsonEnvelope.builder("old").build();
 		JsonEnvelope sentAfterPublication = JsonEnvelope.builder("new").build();
 
-		HttpBackendProxyTransportAccess.beginPreparedHandoff(transport);
+		transport.beginPreparedHandoff();
 		transport.send(sentAfterPublication);
-		HttpBackendProxyTransportAccess.acceptHandoffMessages(transport, List.of(acceptedBeforePublication));
+		transport.acceptHandoffMessages(List.of(acceptedBeforePublication));
 
-		assertEquals(List.of(acceptedBeforePublication, sentAfterPublication), HttpBackendProxyTransportAccess.handoffMessagesSnapshot(transport));
+		assertEquals(List.of(acceptedBeforePublication, sentAfterPublication), transport.handoffMessagesSnapshot());
 		transport.close();
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
 	void shutdownManagerRemainderStaysBehindAlreadyTransferredPrefix() throws Exception {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		JsonEnvelope olderPrefix = JsonEnvelope.builder("older-prefix").build();
 		JsonEnvelope newerRemainder = JsonEnvelope.builder("newer-remainder").build();
 		((java.util.ArrayDeque<JsonEnvelope>) field(transport, "handoffQueue")).addLast(olderPrefix);
 
-		HttpBackendProxyTransportAccess.appendShutdownHandoffMessages(transport, List.of(newerRemainder));
+		transport.appendShutdownHandoffMessages(List.of(newerRemainder));
 
-		assertEquals(List.of(olderPrefix, newerRemainder), HttpBackendProxyTransportAccess.handoffMessagesSnapshot(transport));
+		assertEquals(List.of(olderPrefix, newerRemainder), transport.handoffMessagesSnapshot());
 		transport.close();
 	}
 
@@ -653,8 +647,8 @@ class HttpBackendProxyTransportTest {
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
 		BackendProxyTransportManager previous = new BackendProxyTransportManager(plugin);
 		BackendProxyTransportManager replacement = new BackendProxyTransportManager(plugin);
-		HttpBackendProxyTransport oldTransport = HttpBackendProxyTransportAccess.create(plugin);
-		HttpBackendProxyTransport newTransport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport oldTransport = new HttpBackendProxyTransport(plugin);
+		HttpBackendProxyTransport newTransport = new HttpBackendProxyTransport(plugin);
 		setField(previous, "preparedTransport", oldTransport);
 		setField(replacement, "transport", newTransport);
 		java.util.ArrayDeque<JsonEnvelope> oldQueue =
@@ -683,12 +677,12 @@ class HttpBackendProxyTransportTest {
 
 		assertDoesNotThrow(() -> previous.completePreparedTransportHandoff(replacement));
 		replacement.awaitAsyncHandoff(System.nanoTime() + TimeUnit.SECONDS.toNanos(2));
-		List<JsonEnvelope> queued = HttpBackendProxyTransportAccess.handoffMessagesSnapshot(newTransport);
+		List<JsonEnvelope> queued = newTransport.handoffMessagesSnapshot();
 		assertEquals(4096, queued.size());
 		assertEquals(oldMessages, queued.subList(0, 2048));
 		assertEquals(preparedMessages, queued.subList(2048, 3072));
 		assertEquals(replacementMessages.subList(0, 1024), queued.subList(3072, 4096));
-		assertEquals(0, HttpBackendProxyTransportAccess.preparedMessageCount(oldTransport));
+		assertEquals(0, oldTransport.preparedMessageCount());
 		assertTrue(((java.util.ArrayDeque<JsonEnvelope>) field(previous, "preparedSends")).isEmpty());
 		newTransport.close();
 	}
@@ -699,8 +693,8 @@ class HttpBackendProxyTransportTest {
 		VotingPluginMain plugin = mock(VotingPluginMain.class);
 		BackendProxyTransportManager previous = new BackendProxyTransportManager(plugin);
 		BackendProxyTransportManager replacement = new BackendProxyTransportManager(plugin);
-		HttpBackendProxyTransport oldTransport = HttpBackendProxyTransportAccess.create(plugin);
-		HttpBackendProxyTransport newTransport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport oldTransport = new HttpBackendProxyTransport(plugin);
+		HttpBackendProxyTransport newTransport = new HttpBackendProxyTransport(plugin);
 		setField(previous, "preparedTransport", oldTransport);
 		setField(replacement, "transport", newTransport);
 		java.util.ArrayDeque<JsonEnvelope> oldQueue =
@@ -724,8 +718,8 @@ class HttpBackendProxyTransportTest {
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
 		BackendProxyTransportManager previous = new BackendProxyTransportManager(plugin);
 		BackendProxyTransportManager replacement = new BackendProxyTransportManager(plugin);
-		HttpBackendProxyTransport oldTransport = HttpBackendProxyTransportAccess.create(plugin);
-		HttpBackendProxyTransport newTransport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport oldTransport = new HttpBackendProxyTransport(plugin);
+		HttpBackendProxyTransport newTransport = new HttpBackendProxyTransport(plugin);
 		setField(previous, "preparedTransport", oldTransport);
 		setField(replacement, "transport", newTransport);
 		java.util.ArrayDeque<JsonEnvelope> oldQueue =
@@ -745,7 +739,7 @@ class HttpBackendProxyTransportTest {
 		assertEquals(3072, oldQueue.size());
 		assertEquals(1024, ((java.util.ArrayDeque<?>) field(previous, "preparedSends")).size());
 		assertEquals(2, ((java.util.ArrayDeque<?>) field(replacement, "preparedSends")).size());
-		assertTrue(HttpBackendProxyTransportAccess.handoffMessagesSnapshot(newTransport).isEmpty());
+		assertTrue(newTransport.handoffMessagesSnapshot().isEmpty());
 	}
 
 	@Test
@@ -754,7 +748,7 @@ class HttpBackendProxyTransportTest {
 		VotingPluginMain plugin = mock(VotingPluginMain.class);
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
 		BackendProxyTransportManager manager = new BackendProxyTransportManager(plugin);
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(plugin);
 		setField(manager, "transport", transport);
 		setField(transport, "managerHandoffActive", true);
 		java.util.ArrayDeque<JsonEnvelope> httpQueue =
@@ -778,7 +772,7 @@ class HttpBackendProxyTransportTest {
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
 		BackendProxyTransportManager previous = new BackendProxyTransportManager(plugin);
 		BackendProxyTransportManager replacement = new BackendProxyTransportManager(plugin);
-		HttpBackendProxyTransport oldTransport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport oldTransport = new HttpBackendProxyTransport(plugin);
 		HttpBackendProxyTransport newTransport = mock(HttpBackendProxyTransport.class);
 		JsonEnvelope envelope = JsonEnvelope.builder("accepted-once").build();
 		CountDownLatch sending = new CountDownLatch(1);
@@ -807,7 +801,8 @@ class HttpBackendProxyTransportTest {
 		closing.join(TimeUnit.SECONDS.toMillis(2));
 		assertFalse(closing.isAlive());
 		verify(newTransport).send(envelope);
-		HttpBackendProxyTransportAccess.acceptHandoffMessages(verify(newTransport, org.mockito.Mockito.never()), org.mockito.ArgumentMatchers.anyList());
+		verify(newTransport, org.mockito.Mockito.never())
+				.acceptHandoffMessages(org.mockito.ArgumentMatchers.anyList());
 	}
 
 	@Test
@@ -817,8 +812,8 @@ class HttpBackendProxyTransportTest {
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
 		BackendProxyTransportManager previous = new BackendProxyTransportManager(plugin);
 		BackendProxyTransportManager replacement = new BackendProxyTransportManager(plugin);
-		HttpBackendProxyTransport oldTransport = HttpBackendProxyTransportAccess.create(plugin);
-		HttpBackendProxyTransport newTransport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport oldTransport = new HttpBackendProxyTransport(plugin);
+		HttpBackendProxyTransport newTransport = new HttpBackendProxyTransport(plugin);
 		HttpBackendTransportConnector connector = mock(HttpBackendTransportConnector.class);
 		JsonEnvelope source = JsonEnvelope.builder("source").build();
 		JsonEnvelope adapted = JsonEnvelope.builder("adapted").build();
@@ -879,7 +874,7 @@ class HttpBackendProxyTransportTest {
 		VotingPluginMain plugin = mock(VotingPluginMain.class);
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
 		BackendProxyTransportManager manager = new BackendProxyTransportManager(plugin);
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(plugin);
 		HttpBackendTransportConnector connector = mock(HttpBackendTransportConnector.class);
 		JsonEnvelope envelope = JsonEnvelope.builder("shutdown").build();
 		CountDownLatch sending = new CountDownLatch(1);
@@ -946,8 +941,8 @@ class HttpBackendProxyTransportTest {
 		VotingPluginMain plugin = mock(VotingPluginMain.class);
 		BackendProxyTransportManager previous = new BackendProxyTransportManager(plugin);
 		BackendProxyTransportManager replacement = new BackendProxyTransportManager(plugin);
-		HttpBackendProxyTransport oldTransport = HttpBackendProxyTransportAccess.create(plugin);
-		HttpBackendProxyTransport newTransport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport oldTransport = new HttpBackendProxyTransport(plugin);
+		HttpBackendProxyTransport newTransport = new HttpBackendProxyTransport(plugin);
 		JsonEnvelope old = JsonEnvelope.builder("old").build();
 		JsonEnvelope prepared = JsonEnvelope.builder("prepared").build();
 		setField(previous, "preparedTransport", oldTransport);
@@ -961,7 +956,7 @@ class HttpBackendProxyTransportTest {
 
 		assertThrows(IllegalStateException.class, () -> previous.completePreparedTransportHandoff(replacement));
 
-		assertEquals(List.of(old), HttpBackendProxyTransportAccess.preparedMessagesSnapshot(oldTransport));
+		assertEquals(List.of(old), oldTransport.preparedMessagesSnapshot());
 		java.util.ArrayDeque<?> retained = (java.util.ArrayDeque<?>) field(previous, "preparedSends");
 		assertEquals(1, retained.size());
 		assertSame(prepared, field(retained.peekFirst(), "source"));
@@ -971,13 +966,13 @@ class HttpBackendProxyTransportTest {
 	@Test
 	@SuppressWarnings("unchecked")
 	void preparedDrainPreservesStartupAndExistingHandoffMessagesInFifoOrder() throws Exception {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		JsonEnvelope startup = JsonEnvelope.builder("startup").build();
 		JsonEnvelope handoff = JsonEnvelope.builder("handoff").build();
 		((java.util.ArrayDeque<JsonEnvelope>) field(transport, "startupQueue")).add(startup);
 		((java.util.ArrayDeque<JsonEnvelope>) field(transport, "handoffQueue")).add(handoff);
 
-		assertEquals(List.of(startup, handoff), HttpBackendProxyTransportAccess.drainPreparedMessages(transport));
+		assertEquals(List.of(startup, handoff), transport.drainPreparedMessages());
 		assertTrue(((java.util.ArrayDeque<JsonEnvelope>) field(transport, "startupQueue")).isEmpty());
 		assertTrue(((java.util.ArrayDeque<JsonEnvelope>) field(transport, "handoffQueue")).isEmpty());
 	}
@@ -987,7 +982,7 @@ class HttpBackendProxyTransportTest {
 	void rollbackRecreateKeepsAnOversizedCombinedQueueInTheDrainedHandoffLane() throws Exception {
 		VotingPluginMain plugin = mock(VotingPluginMain.class);
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(plugin);
 		Path credentials = directory.resolve("http");
 		setField(transport, "configuredDirectory", credentials);
 		setField(transport, "configuredServerId", "lobby-1");
@@ -1014,7 +1009,7 @@ class HttpBackendProxyTransportTest {
 		HttpBackendProxyTransport restored = null;
 		Thread setup = null;
 		try {
-			restored = HttpBackendProxyTransportAccess.recreatePrepared(transport);
+			restored = transport.recreatePrepared();
 			assertTrue(((java.util.ArrayDeque<JsonEnvelope>) field(restored, "startupQueue")).isEmpty(),
 					"rollback must not synchronously overfill the connector's 1024-entry queue");
 			assertEquals(queued,
@@ -1036,7 +1031,7 @@ class HttpBackendProxyTransportTest {
 		when(plugin.getLogger()).thenReturn(java.util.logging.Logger.getAnonymousLogger());
 		BackendProxyTransportManager manager = new BackendProxyTransportManager(plugin);
 		HttpBackendProxyTransport previous = mock(HttpBackendProxyTransport.class);
-		HttpBackendProxyTransport restored = HttpBackendProxyTransportAccess.create(plugin);
+		HttpBackendProxyTransport restored = new HttpBackendProxyTransport(plugin);
 		java.util.ArrayDeque<JsonEnvelope> restoredQueue =
 				(java.util.ArrayDeque<JsonEnvelope>) field(restored, "handoffQueue");
 		for (int index = 0; index < 4096; index++)
@@ -1044,29 +1039,29 @@ class HttpBackendProxyTransportTest {
 		JsonEnvelope first = JsonEnvelope.builder("fenced-1").build();
 		JsonEnvelope second = JsonEnvelope.builder("fenced-2").build();
 		setField(manager, "preparedTransport", previous);
-		when(HttpBackendProxyTransportAccess.recreatePrepared(previous)).thenReturn(restored);
+		when(previous.recreatePrepared()).thenReturn(restored);
 		manager.send(first);
 		manager.send(second);
 
 		manager.restorePreparedTransport();
 
 		long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(2);
-		while (HttpBackendProxyTransportAccess.handoffMessagesSnapshot(restored).size() != 4098 && System.nanoTime() < deadline)
+		while (restored.handoffMessagesSnapshot().size() != 4098 && System.nanoTime() < deadline)
 			Thread.onSpinWait();
-		assertEquals(4098, HttpBackendProxyTransportAccess.handoffMessagesSnapshot(restored).size());
-		assertSame(first, HttpBackendProxyTransportAccess.handoffMessagesSnapshot(restored).get(4096));
-		assertSame(second, HttpBackendProxyTransportAccess.handoffMessagesSnapshot(restored).get(4097));
+		assertEquals(4098, restored.handoffMessagesSnapshot().size());
+		assertSame(first, restored.handoffMessagesSnapshot().get(4096));
+		assertSame(second, restored.handoffMessagesSnapshot().get(4097));
 		assertTrue(((java.util.ArrayDeque<?>) field(manager, "asyncHandoffSends")).isEmpty());
 
 		manager.send(JsonEnvelope.builder("newer-rejected").build());
-		assertEquals(4098, HttpBackendProxyTransportAccess.handoffMessagesSnapshot(restored).size(),
+		assertEquals(4098, restored.handoffMessagesSnapshot().size(),
 				"normal sends must not expand the one-time rollback recovery allowance");
 	}
 
 	@Test
 	@SuppressWarnings("unchecked")
 	void shutdownCanAppendTheReservedRollbackRemainder() throws Exception {
-		HttpBackendProxyTransport transport = HttpBackendProxyTransportAccess.create(mock(VotingPluginMain.class));
+		HttpBackendProxyTransport transport = new HttpBackendProxyTransport(mock(VotingPluginMain.class));
 		java.util.ArrayDeque<JsonEnvelope> handoff =
 				(java.util.ArrayDeque<JsonEnvelope>) field(transport, "handoffQueue");
 		for (int index = 0; index < 4096; index++)
@@ -1074,12 +1069,12 @@ class HttpBackendProxyTransportTest {
 		JsonEnvelope first = JsonEnvelope.builder("fenced-1").build();
 		JsonEnvelope second = JsonEnvelope.builder("fenced-2").build();
 
-		HttpBackendProxyTransportAccess.activateRestoredHandoffDrain(transport, 2);
-		HttpBackendProxyTransportAccess.appendShutdownHandoffMessages(transport, List.of(first, second));
+		transport.activateRestoredHandoffDrain(2);
+		transport.appendShutdownHandoffMessages(List.of(first, second));
 
-		assertEquals(4098, HttpBackendProxyTransportAccess.handoffMessagesSnapshot(transport).size());
-		assertSame(first, HttpBackendProxyTransportAccess.handoffMessagesSnapshot(transport).get(4096));
-		assertSame(second, HttpBackendProxyTransportAccess.handoffMessagesSnapshot(transport).get(4097));
+		assertEquals(4098, transport.handoffMessagesSnapshot().size());
+		assertSame(first, transport.handoffMessagesSnapshot().get(4096));
+		assertSame(second, transport.handoffMessagesSnapshot().get(4097));
 	}
 
 	private static HttpConnectionCode code(String serverId, Instant expiry) {
@@ -1090,7 +1085,7 @@ class HttpBackendProxyTransportTest {
 	private static void setField(Object target, String name, Object value) throws Exception {
 		java.lang.reflect.Field field = target.getClass().getDeclaredField(name);
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, target, value);
+		field.set(target, value);
 	}
 
 	private static Object field(Object target, String name) throws Exception {

VotingPlugin/src/test/java/com/bencodez/votingplugin/backendproxy/transport/MqttBackendProxyTransportTest.java

@@ -1,8 +1,4 @@
-package com.bencodez.votingplugin.tests.backendproxy.transport;
-
-import com.bencodez.votingplugin.tests.support.ReflectiveAccess;
-
-import com.bencodez.votingplugin.backendproxy.transport.MqttBackendProxyTransport;
+package com.bencodez.votingplugin.backendproxy.transport;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -38,12 +34,12 @@ class MqttBackendProxyTransportTest {
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		setField(transport, "messageHandler", messages);
 		setField(transport, "authenticator", authenticator);
-		MqttBackendProxyTransportAccess.updateSecurity(transport, authenticator, encryption);
+		transport.updateSecurity(authenticator, encryption);
 		JsonEnvelope vote = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).put("player", "Alex").build();
 		JsonEnvelope signed = authenticator.sign(encryption.encrypt(vote), Domain.MQTT_PROXY_BACKEND, "proxy-a",
 				"votingplugin/servers/backend-a");
 
-		MqttBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, signed, "votingplugin/servers/backend-a");
+		transport.acceptAuthenticatedEnvelope(signed, "votingplugin/servers/backend-a");
 
 		verify(messages).onMessage(org.mockito.ArgumentMatchers.argThat(received ->
 				VotingPluginWire.SUB_VOTE.equals(received.getSubChannel())
@@ -59,9 +55,9 @@ class MqttBackendProxyTransportTest {
 		setField(transport, "authenticator", authenticator);
 		JsonEnvelope vote = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).put("player", "Alex").build();
 
-		MqttBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, authenticator.sign(vote, Domain.MQTT_PROXY_BACKEND, "proxy-a", "votingplugin/servers/backend-a"),
+		transport.acceptAuthenticatedEnvelope(authenticator.sign(vote, Domain.MQTT_PROXY_BACKEND, "proxy-a", "votingplugin/servers/backend-a"),
 				"votingplugin/servers/backend-a");
-		MqttBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, vote, "votingplugin/servers/backend-a");
+		transport.acceptAuthenticatedEnvelope(vote, "votingplugin/servers/backend-a");
 
 		verify(messages).onMessage(org.mockito.ArgumentMatchers.argThat(received ->
 				VotingPluginWire.SUB_VOTE.equals(received.getSubChannel())
@@ -80,9 +76,9 @@ class MqttBackendProxyTransportTest {
 		JsonEnvelope signed = authenticator.sign(vote, Domain.MQTT_PROXY_BACKEND, "proxy-a",
 				"votingplugin/servers/backend-a");
 
-		MqttBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, signed, "votingplugin/servers/backend-b");
+		transport.acceptAuthenticatedEnvelope(signed, "votingplugin/servers/backend-b");
 		org.mockito.Mockito.verifyNoInteractions(messages);
-		MqttBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, signed, "votingplugin/servers/backend-a");
+		transport.acceptAuthenticatedEnvelope(signed, "votingplugin/servers/backend-a");
 		verify(messages).onMessage(org.mockito.ArgumentMatchers.any());
 	}
 
@@ -96,6 +92,6 @@ class MqttBackendProxyTransportTest {
 	private static void setField(Object target, String name, Object value) throws Exception {
 		Field field = target.getClass().getDeclaredField(name);
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, target, value);
+		field.set(target, value);
 	}
 }

VotingPlugin/src/test/java/com/bencodez/votingplugin/backendproxy/transport/RedisBackendProxyTransportTest.java

@@ -1,10 +1,4 @@
-package com.bencodez.votingplugin.tests.backendproxy.transport;
-
-import com.bencodez.votingplugin.tests.backendproxy.cache.ProcessedVoteCacheAccess;
-import com.bencodez.votingplugin.tests.support.ReflectiveAccess;
-
-import com.bencodez.votingplugin.backendproxy.transport.BackendProxyTransportManager;
-import com.bencodez.votingplugin.backendproxy.transport.RedisBackendProxyTransport;
+package com.bencodez.votingplugin.backendproxy.transport;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -56,17 +50,17 @@ class RedisBackendProxyTransportTest {
 		SharedTransportEnvelopeAuthenticator authenticator = authenticator();
 		TransportEnvelopeEncryption encryption = TransportEnvelopeEncryption.load(
 				temporaryDirectory.resolve("secretkey.key"), TransportEnvelopeEncryption.Domain.PROXY_BACKEND, true);
-		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, ProcessedVoteCacheAccess.create());
+		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, new ProcessedVoteCache());
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		setField(transport, "messageHandler", messages);
 		setField(transport, "authenticator", authenticator);
-		RedisBackendProxyTransportAccess.updateSecurity(transport, authenticator, encryption);
+		transport.updateSecurity(authenticator, encryption);
 		JsonEnvelope vote = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).put("player", "Alex").build();
 		JsonEnvelope encrypted = VotingPluginWire.withRedisDeliveryId(encryption.encrypt(vote));
 		JsonEnvelope signed = authenticator.sign(encrypted, Domain.REDIS_PROXY_BACKEND, "proxy-a",
 				"VotingPlugin_backend-a");
 
-		RedisBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, signed, "VotingPlugin_backend-a");
+		transport.acceptAuthenticatedEnvelope(signed, "VotingPlugin_backend-a");
 
 		verify(messages).onMessage(org.mockito.ArgumentMatchers.argThat(received ->
 				VotingPluginWire.SUB_VOTE.equals(received.getSubChannel())
@@ -76,7 +70,7 @@ class RedisBackendProxyTransportTest {
 	@Test
 	void authenticatedVoteIsAcceptedAndUnsignedPresenceIsRejectedBeforeDispatch() throws Exception {
 		SharedTransportEnvelopeAuthenticator authenticator = authenticator();
-		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, ProcessedVoteCacheAccess.create());
+		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, new ProcessedVoteCache());
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		setField(transport, "messageHandler", messages);
 		setField(transport, "authenticator", authenticator);
@@ -85,9 +79,9 @@ class RedisBackendProxyTransportTest {
 		JsonEnvelope signedVote = authenticator.sign(VotingPluginWire.withRedisDeliveryId(vote),
 				Domain.REDIS_PROXY_BACKEND, "proxy-a", "VotingPlugin_backend-a");
 
-		RedisBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, signedVote, "VotingPlugin_backend-a");
-		RedisBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, vote, "VotingPlugin_backend-a");
-		RedisBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, VotingPluginWire.login("Alex",
+		transport.acceptAuthenticatedEnvelope(signedVote, "VotingPlugin_backend-a");
+		transport.acceptAuthenticatedEnvelope(vote, "VotingPlugin_backend-a");
+		transport.acceptAuthenticatedEnvelope(VotingPluginWire.login("Alex",
 				"00000000-0000-0000-0000-000000000001", "backend-a"), "VotingPlugin_backend-a");
 
 		verify(messages).onMessage(org.mockito.ArgumentMatchers.argThat(received ->
@@ -100,7 +94,7 @@ class RedisBackendProxyTransportTest {
 	@Test
 	void copiedRedisVoteCannotAuthenticateOnAnotherBackendChannel() throws Exception {
 		SharedTransportEnvelopeAuthenticator authenticator = authenticator();
-		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, ProcessedVoteCacheAccess.create());
+		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, new ProcessedVoteCache());
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		setField(transport, "messageHandler", messages);
 		setField(transport, "authenticator", authenticator);
@@ -108,31 +102,31 @@ class RedisBackendProxyTransportTest {
 		JsonEnvelope signed = authenticator.sign(vote, Domain.REDIS_PROXY_BACKEND, "proxy-a",
 				"VotingPlugin_backend-a");
 
-		RedisBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, signed, "VotingPlugin_backend-b");
+		transport.acceptAuthenticatedEnvelope(signed, "VotingPlugin_backend-b");
 		verifyNoInteractions(messages);
-		RedisBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, signed, "VotingPlugin_backend-a");
+		transport.acceptAuthenticatedEnvelope(signed, "VotingPlugin_backend-a");
 		verify(messages).onMessage(org.mockito.ArgumentMatchers.any());
 	}
 
 	@Test
 	void exactAuthenticatedRedisReplayCannotDuplicateVoteProcessing() throws Exception {
 		SharedTransportEnvelopeAuthenticator authenticator = authenticator();
-		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, ProcessedVoteCacheAccess.create());
+		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, new ProcessedVoteCache());
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		setField(transport, "messageHandler", messages);
 		setField(transport, "authenticator", authenticator);
 		JsonEnvelope signed = authenticator.sign(VotingPluginWire.withRedisDeliveryId(
 				JsonEnvelope.builder(VotingPluginWire.SUB_VOTE).build()), Domain.REDIS_PROXY_BACKEND, "proxy-a", "VotingPlugin_backend-a");
 
-		RedisBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, signed, "VotingPlugin_backend-a");
-		RedisBackendProxyTransportAccess.acceptAuthenticatedEnvelope(transport, signed, "VotingPlugin_backend-a");
+		transport.acceptAuthenticatedEnvelope(signed, "VotingPlugin_backend-a");
+		transport.acceptAuthenticatedEnvelope(signed, "VotingPlugin_backend-a");
 
 		verify(messages, times(1)).onMessage(org.mockito.ArgumentMatchers.any());
 	}
 
 	@Test
 	void validationHonorsTlsAndHostnameVerification() {
-		DefaultJedisClientConfig config = RedisBackendProxyTransportAccess.buildValidationClientConfig(3, "user", "secret",
+		DefaultJedisClientConfig config = RedisBackendProxyTransport.buildValidationClientConfig(3, "user", "secret",
 				true);
 
 		assertTrue(config.isSsl());
@@ -149,20 +143,20 @@ class RedisBackendProxyTransportTest {
 
 	@Test
 	void validationKeepsTlsDisabledByDefault() {
-		assertFalse(RedisBackendProxyTransportAccess.buildValidationClientConfig(0, null, null, false).isSsl());
+		assertFalse(RedisBackendProxyTransport.buildValidationClientConfig(0, null, null, false).isSsl());
 	}
 
 	@Test
 	void legacyHandoffBufferDegradesAtItsFixedLimit() throws Exception {
-		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, ProcessedVoteCacheAccess.create());
+		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, new ProcessedVoteCache());
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		Field handler = RedisBackendProxyTransport.class.getDeclaredField("messageHandler");
 		handler.setAccessible(true);
-		ReflectiveAccess.set(handler, transport, messages);
+		handler.set(transport, messages);
 		JsonEnvelope envelope = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).build();
 
-		for (int index = 0; index <= RedisBackendProxyTransportAccess.MAX_LEGACY_HANDOFF_DELIVERIES; index++) {
-			RedisBackendProxyTransportAccess.dispatchLegacy(transport, envelope);
+		for (int index = 0; index <= RedisBackendProxyTransport.MAX_LEGACY_HANDOFF_DELIVERIES; index++) {
+			transport.dispatchLegacy(envelope);
 		}
 
 		verify(messages, times(1)).onMessage(envelope);
@@ -170,45 +164,45 @@ class RedisBackendProxyTransportTest {
 
 	@Test
 	void legacyHandoffBufferDegradesForAnOversizedEnvelope() throws Exception {
-		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, ProcessedVoteCacheAccess.create());
+		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, new ProcessedVoteCache());
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		Field handler = RedisBackendProxyTransport.class.getDeclaredField("messageHandler");
 		handler.setAccessible(true);
-		ReflectiveAccess.set(handler, transport, messages);
+		handler.set(transport, messages);
 		JsonEnvelope envelope = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE)
 				.put("payload", "x".repeat(ProcessedVoteCache.MAX_LEGACY_REDIS_DELIVERY_BYTES + 1)).build();
 
-		RedisBackendProxyTransportAccess.dispatchLegacy(transport, envelope);
+		transport.dispatchLegacy(envelope);
 
 		verify(messages).onMessage(envelope);
 	}
 
 	@Test
 	void retiredListenerDropsLegacyDeliveriesAfterShutdownTimeout() throws Exception {
-		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, ProcessedVoteCacheAccess.create());
+		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, new ProcessedVoteCache());
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		Field handler = RedisBackendProxyTransport.class.getDeclaredField("messageHandler");
 		handler.setAccessible(true);
-		ReflectiveAccess.set(handler, transport, messages);
-		RedisBackendProxyTransportAccess.fenceAfterHandoff(transport);
+		handler.set(transport, messages);
+		transport.fenceAfterHandoff();
 
-		RedisBackendProxyTransportAccess.dispatchLegacy(transport, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).build());
+		transport.dispatchLegacy(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).build());
 
 		verifyNoInteractions(messages);
 	}
 
 	@Test
 	void retiredListenerDoesNotReserveOrDispatchDeliveryIds() throws Exception {
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create();
+		ProcessedVoteCache cache = new ProcessedVoteCache();
 		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, cache);
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		Field handler = RedisBackendProxyTransport.class.getDeclaredField("messageHandler");
 		handler.setAccessible(true);
-		ReflectiveAccess.set(handler, transport, messages);
-		RedisBackendProxyTransportAccess.fenceAfterHandoff(transport);
+		handler.set(transport, messages);
+		transport.fenceAfterHandoff();
 		String deliveryId = "00000000-0000-0000-0000-000000000001";
 
-		RedisBackendProxyTransportAccess.dispatchIdentified(transport, JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).build(), deliveryId);
+		transport.dispatchIdentified(JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).build(), deliveryId);
 
 		assertTrue(cache.reserveRedisDelivery(deliveryId), "retired listener must not consume shared deduplication state");
 		verifyNoInteractions(messages);
@@ -216,7 +210,7 @@ class RedisBackendProxyTransportTest {
 
 	@Test
 	void standbyBuffersIdentifiedDeliveriesUntilItIsPublished() throws Exception {
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create();
+		ProcessedVoteCache cache = new ProcessedVoteCache();
 		cache.registerRedisSubscriber(new Object());
 		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, cache);
 		Field identity = RedisBackendProxyTransport.class.getDeclaredField("subscriberIdentity");
@@ -228,12 +222,12 @@ class RedisBackendProxyTransportTest {
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		Field handler = RedisBackendProxyTransport.class.getDeclaredField("messageHandler");
 		handler.setAccessible(true);
-		ReflectiveAccess.set(handler, transport, messages);
+		handler.set(transport, messages);
 		String deliveryId = "00000000-0000-0000-0000-000000000002";
 		JsonEnvelope envelope = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE)
 				.put(VotingPluginWire.K_REDIS_DELIVERY_ID, deliveryId).build();
 
-		RedisBackendProxyTransportAccess.dispatchIdentified(transport, envelope, deliveryId);
+		transport.dispatchIdentified(envelope, deliveryId);
 
 		verifyNoInteractions(messages);
 		transport.activateAfterHandoff();
@@ -258,8 +252,8 @@ class RedisBackendProxyTransportTest {
 		JsonEnvelope identified = JsonEnvelope.builder("identified")
 				.put(VotingPluginWire.K_REDIS_DELIVERY_ID, deliveryId).build();
 
-		RedisBackendProxyTransportAccess.dispatchLegacy(transport, legacy);
-		RedisBackendProxyTransportAccess.dispatchIdentified(transport, identified, deliveryId);
+		transport.dispatchLegacy(legacy);
+		transport.dispatchIdentified(identified, deliveryId);
 		transport.activateAfterHandoff();
 		transport.replayAfterHandoffPublication();
 
@@ -270,7 +264,7 @@ class RedisBackendProxyTransportTest {
 
 	@Test
 	void legacyCopiesDoNotExposeReliableDeliveryIdentity() throws Exception {
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create();
+		ProcessedVoteCache cache = new ProcessedVoteCache();
 		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, cache);
 		Field identity = RedisBackendProxyTransport.class.getDeclaredField("subscriberIdentity");
 		identity.setAccessible(true);
@@ -281,7 +275,7 @@ class RedisBackendProxyTransportTest {
 		JsonEnvelope mixed = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE)
 				.put(VotingPluginWire.K_REDIS_DELIVERY_ID, deliveryId).put("payload", "legacy").build();
 
-		RedisBackendProxyTransportAccess.dispatchLegacy(transport, mixed);
+		transport.dispatchLegacy(mixed);
 
 		org.mockito.ArgumentCaptor<JsonEnvelope> captured = org.mockito.ArgumentCaptor.forClass(JsonEnvelope.class);
 		verify(messages).onMessage(captured.capture());
@@ -294,9 +288,9 @@ class RedisBackendProxyTransportTest {
 		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, mock(ProcessedVoteCache.class));
 		setBoolean(transport, "standbySubscriber", true);
 		setField(transport, "messageHandler", mock(GlobalMessageHandler.class));
-		for (int index = 0; index <= RedisBackendProxyTransportAccess.MAX_IDENTIFIED_HANDOFF_DELIVERIES; index++) {
+		for (int index = 0; index <= RedisBackendProxyTransport.MAX_IDENTIFIED_HANDOFF_DELIVERIES; index++) {
 			String deliveryId = String.format("00000000-0000-0000-0000-%012d", index);
-			RedisBackendProxyTransportAccess.dispatchIdentified(transport, JsonEnvelope.builder("identified")
+			transport.dispatchIdentified(JsonEnvelope.builder("identified")
 					.put(VotingPluginWire.K_REDIS_DELIVERY_ID, deliveryId).build(), deliveryId);
 		}
 
@@ -312,7 +306,7 @@ class RedisBackendProxyTransportTest {
 		JsonEnvelope oversized = JsonEnvelope.builder("legacy")
 				.put("payload", "x".repeat(ProcessedVoteCache.MAX_LEGACY_REDIS_DELIVERY_BYTES + 1)).build();
 
-		RedisBackendProxyTransportAccess.dispatchLegacy(transport, oversized);
+		transport.dispatchLegacy(oversized);
 
 		verifyNoInteractions(messages);
 		assertThrows(IllegalStateException.class, transport::activateAfterHandoff);
@@ -325,8 +319,8 @@ class RedisBackendProxyTransportTest {
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		setField(transport, "messageHandler", messages);
 
-		for (int index = 0; index <= RedisBackendProxyTransportAccess.MAX_LEGACY_HANDOFF_DELIVERIES; index++)
-			RedisBackendProxyTransportAccess.dispatchLegacy(transport, JsonEnvelope.builder("legacy-" + index).build());
+		for (int index = 0; index <= RedisBackendProxyTransport.MAX_LEGACY_HANDOFF_DELIVERIES; index++)
+			transport.dispatchLegacy(JsonEnvelope.builder("legacy-" + index).build());
 
 		verifyNoInteractions(messages);
 		assertThrows(IllegalStateException.class, transport::activateAfterHandoff);
@@ -334,7 +328,7 @@ class RedisBackendProxyTransportTest {
 
 	@Test
 	void activeLegacyAccountingOverflowAbortsLaggingStandbyPublication() throws Exception {
-		ProcessedVoteCache cache = ProcessedVoteCacheAccess.create();
+		ProcessedVoteCache cache = new ProcessedVoteCache();
 		Object previousIdentity = new Object();
 		cache.registerRedisSubscriber(previousIdentity);
 		RedisBackendProxyTransport replacement = new RedisBackendProxyTransport(null, cache);
@@ -352,7 +346,7 @@ class RedisBackendProxyTransportTest {
 
 	@Test
 	void fencingWaitsForAnIdentifiedMessageHandler() throws Exception {
-		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, ProcessedVoteCacheAccess.create());
+		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(null, new ProcessedVoteCache());
 		CountDownLatch entered = new CountDownLatch(1);
 		CountDownLatch release = new CountDownLatch(1);
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
@@ -367,8 +361,8 @@ class RedisBackendProxyTransportTest {
 		}).when(messages).onMessage(org.mockito.ArgumentMatchers.any(JsonEnvelope.class));
 		Field handler = RedisBackendProxyTransport.class.getDeclaredField("messageHandler");
 		handler.setAccessible(true);
-		ReflectiveAccess.set(handler, transport, messages);
-		Thread delivery = new Thread(() -> RedisBackendProxyTransportAccess.dispatchIdentified(transport,
+		handler.set(transport, messages);
+		Thread delivery = new Thread(() -> transport.dispatchIdentified(
 				JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).build(), "delivery"));
 		delivery.start();
 		assertTrue(entered.await(1, TimeUnit.SECONDS));
@@ -378,7 +372,7 @@ class RedisBackendProxyTransportTest {
 				new java.util.concurrent.atomic.AtomicReference<>();
 		Thread retirement = new Thread(() -> {
 			try {
-				RedisBackendProxyTransportAccess.fenceAfterHandoff(transport);
+				transport.fenceAfterHandoff();
 			} catch (Throwable failure) {
 				fenceFailure.set(failure);
 			} finally {
@@ -422,7 +416,7 @@ class RedisBackendProxyTransportTest {
 		}).when(messages).onMessage(org.mockito.ArgumentMatchers.any(JsonEnvelope.class));
 		setField(transport, "messageHandler", messages);
 
-		Thread delivery = new Thread(() -> RedisBackendProxyTransportAccess.dispatchLegacy(transport,
+		Thread delivery = new Thread(() -> transport.dispatchLegacy(
 				JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).build()));
 		delivery.start();
 		assertTrue(callbackEntered.await(1, TimeUnit.SECONDS));
@@ -481,8 +475,8 @@ class RedisBackendProxyTransportTest {
 		JsonEnvelope identified = JsonEnvelope.builder("identified-overlap").build();
 		setBoolean(standby, "standbySubscriber", true);
 		setField(standby, "messageHandler", mock(GlobalMessageHandler.class));
-		RedisBackendProxyTransportAccess.dispatchLegacy(standby, legacy);
-		RedisBackendProxyTransportAccess.dispatchIdentified(standby, identified, "00000000-0000-0000-0000-000000001594");
+		standby.dispatchLegacy(legacy);
+		standby.dispatchIdentified(identified, "00000000-0000-0000-0000-000000001594");
 		org.mockito.Mockito.doThrow(new IllegalStateException("standby promotion rejected"))
 				.when(standby).activateAfterHandoff();
 		setField(previous, "transport", oldTransport);
@@ -539,13 +533,13 @@ class RedisBackendProxyTransportTest {
 		setField(replacement, "messageHandler", replacementMessages);
 		JsonEnvelope envelope = JsonEnvelope.builder(VotingPluginWire.SUB_VOTE_UPDATE).build();
 
-		Thread delivery = new Thread(() -> RedisBackendProxyTransportAccess.dispatchLegacy(previous, envelope));
+		Thread delivery = new Thread(() -> previous.dispatchLegacy(envelope));
 		delivery.start();
 		assertTrue(entered.await(1, TimeUnit.SECONDS));
-		RedisBackendProxyTransportAccess.dispatchLegacy(replacement, envelope);
+		replacement.dispatchLegacy(envelope);
 		CountDownLatch promoted = new CountDownLatch(1);
 		Thread promotion = new Thread(() -> {
-			RedisBackendProxyTransportAccess.fenceAfterHandoff(previous);
+			previous.fenceAfterHandoff();
 			replacement.activateAfterHandoff();
 			promoted.countDown();
 		});
@@ -574,7 +568,7 @@ class RedisBackendProxyTransportTest {
 			JsonEnvelope envelope = invocation.getArgument(0);
 			order.add(envelope);
 			if (envelope == replayed) {
-				Thread arrival = new Thread(() -> RedisBackendProxyTransportAccess.dispatchIdentified(transport, newer, "new-delivery"));
+				Thread arrival = new Thread(() -> transport.dispatchIdentified(newer, "new-delivery"));
 				arrival.start();
 				arrival.join(TimeUnit.SECONDS.toMillis(1));
 			}
@@ -582,8 +576,8 @@ class RedisBackendProxyTransportTest {
 		}).when(messages).onMessage(org.mockito.ArgumentMatchers.any(JsonEnvelope.class));
 		Field handler = RedisBackendProxyTransport.class.getDeclaredField("messageHandler");
 		handler.setAccessible(true);
-		ReflectiveAccess.set(handler, transport, messages);
-		RedisBackendProxyTransportAccess.dispatchLegacy(transport, replayed);
+		handler.set(transport, messages);
+		transport.dispatchLegacy(replayed);
 
 		transport.activateAfterHandoff();
 		transport.replayAfterHandoffPublication();
@@ -607,15 +601,15 @@ class RedisBackendProxyTransportTest {
 		when(cache.consumeLegacyRedisDelivery(org.mockito.ArgumentMatchers.anyString())).thenReturn(false);
 		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(plugin, cache);
 		setBoolean(transport, "standbySubscriber", true);
-		CountDownLatch replayed = new CountDownLatch(RedisBackendProxyTransportAccess.REPLAY_BATCH_SIZE + 1);
+		CountDownLatch replayed = new CountDownLatch(RedisBackendProxyTransport.REPLAY_BATCH_SIZE + 1);
 		GlobalMessageHandler messages = mock(GlobalMessageHandler.class);
 		doAnswer(invocation -> {
 			replayed.countDown();
 			return null;
 		}).when(messages).onMessage(org.mockito.ArgumentMatchers.any(JsonEnvelope.class));
 		setField(transport, "messageHandler", messages);
-		for (int index = 0; index <= RedisBackendProxyTransportAccess.REPLAY_BATCH_SIZE; index++)
-			RedisBackendProxyTransportAccess.dispatchLegacy(transport, JsonEnvelope.builder("replay-" + index).build());
+		for (int index = 0; index <= RedisBackendProxyTransport.REPLAY_BATCH_SIZE; index++)
+			transport.dispatchLegacy(JsonEnvelope.builder("replay-" + index).build());
 
 		transport.activateAfterHandoff();
 		transport.replayAfterHandoffPublication();
@@ -636,14 +630,14 @@ class RedisBackendProxyTransportTest {
 		queueField.setAccessible(true);
 		@SuppressWarnings("unchecked")
 		java.util.ArrayDeque<JsonEnvelope> queue = (java.util.ArrayDeque<JsonEnvelope>) queueField.get(transport);
-		for (int index = 0; index < RedisBackendProxyTransportAccess.MAX_REPLAY_HANDOFF_DELIVERIES; index++)
+		for (int index = 0; index < RedisBackendProxyTransport.MAX_REPLAY_HANDOFF_DELIVERIES; index++)
 			queue.addLast(JsonEnvelope.builder("queued-" + index).build());
 		JsonEnvelope newer = JsonEnvelope.builder("new").build();
 		CountDownLatch entered = new CountDownLatch(1);
 		CountDownLatch returned = new CountDownLatch(1);
 		Thread callback = new Thread(() -> {
 			entered.countDown();
-			RedisBackendProxyTransportAccess.dispatchIdentified(transport, newer, "new-delivery");
+			transport.dispatchIdentified(newer, "new-delivery");
 			returned.countDown();
 		});
 		callback.start();
@@ -668,12 +662,12 @@ class RedisBackendProxyTransportTest {
 		setField(transport, "messageHandler", mock(GlobalMessageHandler.class));
 		setBoolean(transport, "replayingHandoff", true);
 		java.util.ArrayDeque<JsonEnvelope> queue = replayQueue(transport);
-		for (int index = 0; index < RedisBackendProxyTransportAccess.MAX_REPLAY_HANDOFF_DELIVERIES; index++)
+		for (int index = 0; index < RedisBackendProxyTransport.MAX_REPLAY_HANDOFF_DELIVERIES; index++)
 			queue.addLast(JsonEnvelope.builder("queued-" + index).build());
 		JsonEnvelope received = JsonEnvelope.builder("received").build();
 		CountDownLatch completed = new CountDownLatch(1);
 		Thread subscriber = new Thread(() -> {
-			RedisBackendProxyTransportAccess.dispatchReceivedSubscriberEnvelope(transport, received, "received-delivery");
+			transport.dispatchReceivedSubscriberEnvelope(received, "received-delivery");
 			completed.countDown();
 		});
 		subscriber.start();
@@ -706,11 +700,11 @@ class RedisBackendProxyTransportTest {
 		JsonEnvelope before = JsonEnvelope.builder("before").build();
 		JsonEnvelope during = JsonEnvelope.builder("during").build();
 
-		RedisBackendProxyTransportAccess.dispatchIdentified(replacement, before, "before-publication");
+		replacement.dispatchIdentified(before, "before-publication");
 		replacement.activateAfterHandoff();
 		// This is the narrow interval after worker-side promotion but before Bukkit
 		// opens publication/replay. It has already reserved its Redis identity.
-		RedisBackendProxyTransportAccess.dispatchIdentified(replacement, during, "during-publication");
+		replacement.dispatchIdentified(during, "during-publication");
 
 		assertEquals(java.util.List.of(before, during), replacement.detachReplayForFailedHandoff());
 		assertTrue(replayQueue(replacement).isEmpty());
@@ -740,7 +734,7 @@ class RedisBackendProxyTransportTest {
 		setField(replacement, "messageHandler", messages);
 		replacement.acceptReplayFromPreviousHandoff(transferred);
 		JsonEnvelope newer = JsonEnvelope.builder("newer").build();
-		RedisBackendProxyTransportAccess.dispatchIdentified(replacement, newer, "new-overlap");
+		replacement.dispatchIdentified(newer, "new-overlap");
 		replacement.activateAfterHandoff();
 		replacement.replayAfterHandoffPublication();
 
@@ -760,7 +754,7 @@ class RedisBackendProxyTransportTest {
 		JsonEnvelope duringFreeze = JsonEnvelope.builder("during-freeze").build();
 		CountDownLatch completed = new CountDownLatch(1);
 		Thread callback = new Thread(() -> {
-			RedisBackendProxyTransportAccess.dispatchIdentified(previous, duringFreeze, "during-freeze");
+			previous.dispatchIdentified(duringFreeze, "during-freeze");
 			completed.countDown();
 		});
 		callback.start();
@@ -784,7 +778,7 @@ class RedisBackendProxyTransportTest {
 		previous.freezeReplayForSuccessiveHandoff();
 		CountDownLatch callbackDone = new CountDownLatch(1);
 		Thread callback = new Thread(() -> {
-			RedisBackendProxyTransportAccess.dispatchIdentified(previous, JsonEnvelope.builder( "during-close").build(), "during-close");
+			previous.dispatchIdentified(JsonEnvelope.builder("during-close").build(), "during-close");
 			callbackDone.countDown();
 		});
 		callback.start();
@@ -829,7 +823,7 @@ class RedisBackendProxyTransportTest {
 
 	@Test
 	void retiredRedisCleanupDoesNotBlockManagerCloseOnPublicationThread() throws Exception {
-		BackendProxyTransportManager manager = new BackendProxyTransportManager(null, ProcessedVoteCacheAccess.create());
+		BackendProxyTransportManager manager = new BackendProxyTransportManager(null, new ProcessedVoteCache());
 		RedisBackendProxyTransport retired = mock(RedisBackendProxyTransport.class);
 		CountDownLatch closeEntered = new CountDownLatch(1);
 		CountDownLatch releaseClose = new CountDownLatch(1);
@@ -866,7 +860,7 @@ class RedisBackendProxyTransportTest {
 		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(plugin, cache);
 		setBoolean(transport, "standbySubscriber", true);
 		setField(transport, "messageHandler", mock(GlobalMessageHandler.class));
-		RedisBackendProxyTransportAccess.dispatchLegacy(transport, JsonEnvelope.builder("replay").build());
+		transport.dispatchLegacy(JsonEnvelope.builder("replay").build());
 		transport.activateAfterHandoff();
 		transport.replayAfterHandoffPublication();
 
@@ -895,7 +889,7 @@ class RedisBackendProxyTransportTest {
 		RedisBackendProxyTransport transport = new RedisBackendProxyTransport(plugin, cache);
 		setBoolean(transport, "standbySubscriber", true);
 		setField(transport, "messageHandler", mock(GlobalMessageHandler.class));
-		RedisBackendProxyTransportAccess.dispatchLegacy(transport, JsonEnvelope.builder("replay").build());
+		transport.dispatchLegacy(JsonEnvelope.builder("replay").build());
 		transport.activateAfterHandoff();
 		transport.replayAfterHandoffPublication();
 		assertTrue(submitted.await(1, TimeUnit.SECONDS));
@@ -936,8 +930,8 @@ class RedisBackendProxyTransportTest {
 			return null;
 		}).when(messages).onMessage(org.mockito.ArgumentMatchers.any(JsonEnvelope.class));
 		setField(transport, "messageHandler", messages);
-		RedisBackendProxyTransportAccess.dispatchLegacy(transport, JsonEnvelope.builder("first").build());
-		RedisBackendProxyTransportAccess.dispatchLegacy(transport, JsonEnvelope.builder("second").build());
+		transport.dispatchLegacy(JsonEnvelope.builder("first").build());
+		transport.dispatchLegacy(JsonEnvelope.builder("second").build());
 		transport.activateAfterHandoff();
 		transport.replayAfterHandoffPublication();
 		assertTrue(entered.await(1, TimeUnit.SECONDS));
@@ -967,7 +961,7 @@ class RedisBackendProxyTransportTest {
 	private static void setField(Object target, String name, Object value) throws Exception {
 		Field field = target.getClass().getDeclaredField(name);
 		field.setAccessible(true);
-		ReflectiveAccess.set(field, target, value);
+		field.set(target, value);
 	}
 
 	private static java.util.List<JsonEnvelope> preparedSendQueue(BackendProxyTransportManager manager)

VotingPlugin/src/test/java/com/bencodez/votingplugin/backendproxy/transport/SharedInboundPolicyTest.java

@@ -1,8 +1,4 @@
-package com.bencodez.votingplugin.tests.backendproxy.transport;
-
-import com.bencodez.votingplugin.backendproxy.transport.MqttBackendProxyTransport;
-import com.bencodez.votingplugin.backendproxy.transport.RedisBackendProxyTransport;
-import com.bencodez.votingplugin.tests.backendproxy.transport.SharedInboundPolicyAccess;
+package com.bencodez.votingplugin.backendproxy.transport;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -28,19 +24,19 @@ class SharedInboundPolicyTest {
 		SharedTransportEnvelopeAuthenticator required = SharedTransportEnvelopeAuthenticator.load(keyFile, Mode.REQUIRED);
 		TransportEnvelopeEncryption encrypted = TransportEnvelopeEncryption.load(keyFile,
 				TransportEnvelopeEncryption.Domain.PROXY_BACKEND, true);
-		SharedInboundPolicyAccess policy = new SharedInboundPolicyAccess(RedisBackendProxyTransport.class, "vp:a", required,
+		SharedInboundPolicy policy = new SharedInboundPolicy(RedisBackendProxyTransport.class, "vp:a", required,
 				encrypted);
 
-		assertTrue(policy.hasEquivalentPolicy(new SharedInboundPolicyAccess(RedisBackendProxyTransport.class, "vp:a",
+		assertTrue(policy.hasEquivalentPolicy(new SharedInboundPolicy(RedisBackendProxyTransport.class, "vp:a",
 				SharedTransportEnvelopeAuthenticator.load(keyFile, Mode.REQUIRED), TransportEnvelopeEncryption.load(keyFile,
 						TransportEnvelopeEncryption.Domain.PROXY_BACKEND, true))));
-		assertFalse(policy.hasEquivalentPolicy(new SharedInboundPolicyAccess(RedisBackendProxyTransport.class, "vp:b",
+		assertFalse(policy.hasEquivalentPolicy(new SharedInboundPolicy(RedisBackendProxyTransport.class, "vp:b",
 				SharedTransportEnvelopeAuthenticator.load(keyFile, Mode.REQUIRED), encrypted)));
-		assertFalse(policy.hasEquivalentPolicy(new SharedInboundPolicyAccess(MqttBackendProxyTransport.class, "vp:a",
+		assertFalse(policy.hasEquivalentPolicy(new SharedInboundPolicy(MqttBackendProxyTransport.class, "vp:a",
 				SharedTransportEnvelopeAuthenticator.load(keyFile, Mode.REQUIRED), encrypted)));
-		assertFalse(policy.hasEquivalentPolicy(new SharedInboundPolicyAccess(RedisBackendProxyTransport.class, "vp:a",
+		assertFalse(policy.hasEquivalentPolicy(new SharedInboundPolicy(RedisBackendProxyTransport.class, "vp:a",
 				SharedTransportEnvelopeAuthenticator.load(keyFile, Mode.COMPATIBILITY), encrypted)));
-		assertFalse(policy.hasEquivalentPolicy(new SharedInboundPolicyAccess(RedisBackendProxyTransport.class, "vp:a",
+		assertFalse(policy.hasEquivalentPolicy(new SharedInboundPolicy(RedisBackendProxyTransport.class, "vp:a",
 				SharedTransportEnvelopeAuthenticator.load(keyFile, Mode.REQUIRED), TransportEnvelopeEncryption.load(keyFile,
 						TransportEnvelopeEncryption.Domain.PROXY_BACKEND, false))));
 	}