diff --git a/gradle.properties b/gradle.properties index afc04db..a33db68 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = me.earthme.luminol version = 1.21.1-R0.1-SNAPSHOT -foliaCommit = d8461e8ec526ad46de87d60ceee72a9cacdf6621 +foliaCommit = 88e0907cadf2358e1d3e06222c0a97722ca4ce12 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0023-Try-optimizing-the-task-dispatching.patch b/patches/server/0023-Try-optimizing-the-task-dispatching.patch index 116ff5d..bf36783 100644 --- a/patches/server/0023-Try-optimizing-the-task-dispatching.patch +++ b/patches/server/0023-Try-optimizing-the-task-dispatching.patch @@ -44,10 +44,10 @@ index ce388e0ef231d7d73f75f5778c58eb40f6402f0f..7f8473a6db78dc652e0ccfdb7cc03812 private final Long2ReferenceOpenHashMap> sectionByKey = new Long2ReferenceOpenHashMap<>(); private final ReferenceOpenHashSet> deadSections = new ReferenceOpenHashSet<>(); diff --git a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java -index a18da3f3f245031f0547efe9b52a1f2a219ef04a..5e390b2b88d3028f2b2eb07432a9b2a1b2851a3e 100644 +index 056fb1ca7b07d5e713dcbd951830b14fc9025f4c..4bfa83a6683970657eaaaaa265855f0d2e79a3a9 100644 --- a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java +++ b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java -@@ -354,6 +354,47 @@ public final class TickRegionScheduler { +@@ -364,6 +364,47 @@ public final class TickRegionScheduler { return !this.markNotTicking() || this.cancelled.get() ? null : Boolean.valueOf(ret); } diff --git a/patches/server/0054-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch b/patches/server/0054-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch index 714072c..1985014 100644 --- a/patches/server/0054-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch +++ b/patches/server/0054-KioCG-Chunk-API-and-display-of-chunkhot-in-tpsbar.patch @@ -425,10 +425,10 @@ index b3377ed06d703f54e01ba174e5a06dc928cdff96..80af7979f9a2078a6c40c958ced1d487 + // KioCG end } diff --git a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -index b6d72a24a61b30b7c4ad967c196c3fbaa9d68ee9..30aa99541b303ecd8eda8f95e628c38434b36640 100644 +index 5110ca77adcf6daa7ce2247d4fc8af0835b7bd7e..8169536f95e2355e59b00e6d4a7df1ec59da5b5b 100644 --- a/src/main/java/net/minecraft/world/entity/projectile/Projectile.java +++ b/src/main/java/net/minecraft/world/entity/projectile/Projectile.java -@@ -435,4 +435,11 @@ public abstract class Projectile extends Entity implements TraceableEntity { +@@ -440,4 +440,11 @@ public abstract class Projectile extends Entity implements TraceableEntity { return DoubleDoubleImmutablePair.of(d0, d1); } diff --git a/patches/server/0057-Threaded-region-start-tick-and-finished-tick-event.patch b/patches/server/0057-Threaded-region-start-tick-and-finished-tick-event.patch index f1e3e33..f445ab3 100644 --- a/patches/server/0057-Threaded-region-start-tick-and-finished-tick-event.patch +++ b/patches/server/0057-Threaded-region-start-tick-and-finished-tick-event.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Threaded region start tick and finished tick event diff --git a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java -index 5e390b2b88d3028f2b2eb07432a9b2a1b2851a3e..a69d34806db355c99a9ca438f4b5a3263bf666ac 100644 +index 4bfa83a6683970657eaaaaa265855f0d2e79a3a9..6bbc9a0fb94980cd201d7ddb7cb440fcee7786f4 100644 --- a/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java +++ b/src/main/java/io/papermc/paper/threadedregions/TickRegionScheduler.java -@@ -432,7 +432,7 @@ public final class TickRegionScheduler { +@@ -442,7 +442,7 @@ public final class TickRegionScheduler { final long scheduledStart = this.getScheduledStart(); final long scheduledEnd = scheduledStart + TIME_BETWEEN_TICKS; @@ -17,7 +17,7 @@ index 5e390b2b88d3028f2b2eb07432a9b2a1b2851a3e..a69d34806db355c99a9ca438f4b5a326 synchronized (this) { this.currentTickData = new TickTime( lastTickStart, scheduledStart, tickStart, cpuStart, -@@ -464,6 +464,7 @@ public final class TickRegionScheduler { +@@ -477,6 +477,7 @@ public final class TickRegionScheduler { ); this.addTickTime(time);