From 74034a11f8eda77545347b9d17b8e27cd2212403 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Thu, 22 Feb 2024 01:23:36 -0500 Subject: [PATCH] Fix build --- patches/server/0039-Petal-Multithreaded-Tracker.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/patches/server/0039-Petal-Multithreaded-Tracker.patch b/patches/server/0039-Petal-Multithreaded-Tracker.patch index 9f156e4a..4ca64427 100644 --- a/patches/server/0039-Petal-Multithreaded-Tracker.patch +++ b/patches/server/0039-Petal-Multithreaded-Tracker.patch @@ -24,7 +24,7 @@ Some things are too unsafe to run off the main thread so we don't attempt to do that. This multithreaded tracker remains accurate, non-breaking and fast. diff --git a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java -index 06dfd0b27ac0006a2be07f54a0702519a691c6ec..79fe719169c436a0138ffef3566a7b5a553f0498 100644 +index 06dfd0b27ac0006a2be07f54a0702519a691c6ec..daacdb976ba717bc1137b3c78ecd5dd8968d12af 100644 --- a/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java +++ b/src/main/java/io/papermc/paper/plugin/manager/PaperEventManager.java @@ -3,6 +3,7 @@ package io.papermc.paper.plugin.manager; @@ -41,7 +41,7 @@ index 06dfd0b27ac0006a2be07f54a0702519a691c6ec..79fe719169c436a0138ffef3566a7b5a } else if (!isAsync && !onPrimaryThread && !this.server.isStopping()) { - throw new IllegalStateException(event.getEventName() + " may only be triggered synchronously."); + // Leaf start - petal -+ if (org.dreeam.leaf.LeafConfig.enableAsyncEntityTracker) { ++ if (org.dreeam.leaf.LeafConfig.asyncEntityTracker) { + MinecraftServer.getServer().scheduleOnMain(event::callEvent); + return; + } else { @@ -78,7 +78,7 @@ index 66721a27cc9a373a12dffb72c4a403473377eff6..2fbab1b4d20c3ead0ed1a117b29679fa public FullChunkStatus status; diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 2b9968a8a3d0d66d9db5a83dcf2a44767a9fe412..7873646019080bde586cc95634b483910536cc67 100644 +index 2b9968a8a3d0d66d9db5a83dcf2a44767a9fe412..e72c6d658f986339dec9dd0a0669e16fd9b5619b 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1128,8 +1128,35 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -100,7 +100,7 @@ index 2b9968a8a3d0d66d9db5a83dcf2a44767a9fe412..7873646019080bde586cc95634b48391 + // Paper start - optimised tracker private final void processTrackQueue() { -+ if (org.dreeam.leaf.LeafConfig.enableAsyncEntityTracker) { ++ if (org.dreeam.leaf.LeafConfig.asyncEntityTracker) { + if (this.multithreadedTracker == null) { + this.multithreadedTracker = new org.dreeam.leaf.async.tracker.MultithreadedTracker(this.level.chunkSource.entityTickingChunks, this.trackerMainThreadTasks); + }