Skip to content

Skip Folia's EntityScheduler executeTick checks if the scheduler hasn't been used at least once #9984

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Closed
MrPowerGamerBR wants to merge 2 commits into from
Closed

Skip Folia's EntityScheduler executeTick checks if the scheduler hasn't been used at least once #9984

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e31f774
Skip Folia's EntityScheduler executeTick checks if the scheduler hasn…
MrPowerGamerBR Nov 29, 2023
dfec3f8
Rename variable, add brackets
MrPowerGamerBR Nov 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions patches/server/0975-Folia-scheduler-and-owned-region-API.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ the schedulers depending on the result of the ownership check.

diff --git a/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java b/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java
new file mode 100644
index 0000000000000000000000000000000000000000..62484ebf4550b05182f693a3180bbac5d5fd906d
index 0000000000000000000000000000000000000000..a79a6e7da5cdcd2ab654791e8ed3fa63958257e0
--- /dev/null
+++ b/src/main/java/io/papermc/paper/threadedregions/EntityScheduler.java
@@ -0,0 +1,181 @@
@@ -0,0 +1,187 @@
+package io.papermc.paper.threadedregions;
+
+import ca.spottedleaf.concurrentutil.util.Validate;
Expand Down Expand Up @@ -69,6 +69,7 @@ index 0000000000000000000000000000000000000000..62484ebf4550b05182f693a3180bbac5
+ private final Long2ObjectOpenHashMap<List<ScheduledTask>> oneTimeDelayed = new Long2ObjectOpenHashMap<>();
+
+ private final ArrayDeque<ScheduledTask> currentlyExecuting = new ArrayDeque<>();
+ private boolean awaitingFirstTask = false;
+
+ public EntityScheduler(final CraftEntity entity) {
+ this.entity = Validate.notNull(entity);
Expand Down Expand Up @@ -148,6 +149,7 @@ index 0000000000000000000000000000000000000000..62484ebf4550b05182f693a3180bbac5
+ if (this.tickCount == RETIRED_TICK_COUNT) {
+ return false;
+ }
+ this.awaitingFirstTask = true;
+ this.oneTimeDelayed.computeIfAbsent(this.tickCount + Math.max(1L, delay), (final long keyInMap) -> {
+ return new ArrayList<>();
+ }).add(task);
Expand All @@ -162,6 +164,10 @@ index 0000000000000000000000000000000000000000..62484ebf4550b05182f693a3180bbac5
+ * @throws IllegalStateException If the scheduler is retired.
+ */
+ public void executeTick() {
+ if (!this.awaitingFirstTask) {
+ return;
+ }
+
+ final Entity thisEntity = this.entity.getHandleRaw();
+
+ TickThread.ensureTickThread(thisEntity, "May not tick entity scheduler asynchronously");
Expand Down Expand Up @@ -1224,7 +1230,7 @@ index bf77b0dae2ca25437df7386d2196da24d681e2ed..4516991a4d1299d7e93019a4b9bc227b
public void setLevelCallback(EntityInLevelCallback changeListener) {
this.levelCallback = changeListener;
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 9d86b54a9945d4644f7920e06e5d04faaaa2e8c8..16906e8ba7d05275561d465a08b792137d284c4e 100644
index 33c1a46e7bd40784850745cc1a48b9f075da219e..db5f7a4e89aa963b640f2299ba3b08cf7c083506 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -310,6 +310,76 @@ public final class CraftServer implements Server {
Expand Down