SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle chunk unloading during block tick

Browse Source
This commit is contained in:
Spottedleaf
2020-03-30 05:07:04 +01:00
parent 98ce7f6c2e
commit 6778f7c55f
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Spigot-Server-Patches/Optimise-TickListServer-by-rewriting-it.patch
View File

@@ -43,7 +43,7 @@ sets the excessive tick delay to the specified ticks (defaults to
diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
new file mode 100644 new file mode 100644
index 0000000000..e948012d5b index 0000000000..ce653f6b4b
--- /dev/null --- /dev/null
+++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
@@ -343,7 +343,9 @@ index 0000000000..e948012d5b
+ if (chunkProvider.isTickingReadyMainThread(toTick.getPosition())) { + if (chunkProvider.isTickingReadyMainThread(toTick.getPosition())) {
+ toTick.tickState = STATE_TICKING; + toTick.tickState = STATE_TICKING;
+ this.tickFunction.accept(toTick); + this.tickFunction.accept(toTick);
+ if (toTick.tickState == STATE_TICKING) {
+ toTick.tickState = STATE_TICKED; + toTick.tickState = STATE_TICKED;
+ } // else it's STATE_CANCELLED_TICK
+ } else { + } else {
+ // re-schedule eventually + // re-schedule eventually
+ toTick.tickState = STATE_SCHEDULED; + toTick.tickState = STATE_SCHEDULED;
@@ -378,6 +380,9 @@ index 0000000000..e948012d5b
+ } + }
+ +
+ private void onTickEnd(final NextTickListEntry<T> entry) { + private void onTickEnd(final NextTickListEntry<T> entry) {
+ if (entry.tickState == STATE_CANCELLED_TICK) {
+ return;
+ }
+ entry.tickState = STATE_UNSCHEDULED; + entry.tickState = STATE_UNSCHEDULED;
+ +
+ final BlockPosition pos = entry.getPosition(); + final BlockPosition pos = entry.getPosition();