diff --git a/luminol-server/minecraft-patches/features/0032-Tick-regions-api.patch b/luminol-server/minecraft-patches/features/0032-Tick-regions-api.patch index ff7b9e7..eebf260 100644 --- a/luminol-server/minecraft-patches/features/0032-Tick-regions-api.patch +++ b/luminol-server/minecraft-patches/features/0032-Tick-regions-api.patch @@ -5,10 +5,34 @@ Subject: [PATCH] Tick regions api diff --git a/io/papermc/paper/threadedregions/ThreadedRegionizer.java b/io/papermc/paper/threadedregions/ThreadedRegionizer.java -index 604385af903845d966382ad0a4168798e4ed4a0e..7ac803ba9706b65a0125b6e00983fe6a7947991a 100644 +index 604385af903845d966382ad0a4168798e4ed4a0e..45aa5484b1cdb317ed55f1b001dbfe13a720b2a7 100644 --- a/io/papermc/paper/threadedregions/ThreadedRegionizer.java +++ b/io/papermc/paper/threadedregions/ThreadedRegionizer.java -@@ -819,7 +819,7 @@ public final class ThreadedRegionizer callbacks; + private final StampedLock regionLock = new StampedLock(); + private Thread writeLockOwner; ++ public final me.earthme.luminol.api.ThreadedRegionizer threadedRegionizerAPI; // Luminol - Tick region API + + /* + static final record Operation(String type, int chunkX, int chunkZ) {} +@@ -72,6 +73,7 @@ public final class ThreadedRegionizer> mergeIntoLater = new ReferenceOpenHashSet<>(); + private final ReferenceOpenHashSet> expectingMergeFrom = new ReferenceOpenHashSet<>(); ++ public final me.earthme.luminol.api.ThreadedRegion threadedRegionAPI = new me.earthme.luminol.api.impl.ThreadedRegionImpl((ThreadedRegion) this); // Luminol - Tickregion API + + public ThreadedRegion(final ThreadedRegionizer regioniser) { + this.regioniser = regioniser; +@@ -819,7 +822,7 @@ public final class ThreadedRegionizer region) { + this.region = region; diff --git a/luminol-server/paper-patches/features/0010-Tick-regions-api.patch b/luminol-server/paper-patches/features/0010-Tick-regions-api.patch index f05ef9e..9674544 100644 --- a/luminol-server/paper-patches/features/0010-Tick-regions-api.patch +++ b/luminol-server/paper-patches/features/0010-Tick-regions-api.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Tick regions api diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index cd6e46fa68c009deb8dfebcecb88e058dfede0b0..ac4ab407095d998b1418d740ab54e8157bce6a02 100644 +index cd6e46fa68c009deb8dfebcecb88e058dfede0b0..f0c8e76efaf897a81283edbf9a9c2a71bc28c9a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -2517,4 +2517,11 @@ public class CraftWorld extends CraftRegionAccessor implements World { @@ -16,7 +16,7 @@ index cd6e46fa68c009deb8dfebcecb88e058dfede0b0..ac4ab407095d998b1418d740ab54e815 + // Luminol start - Tick regions api + @Override + public me.earthme.luminol.api.ThreadedRegionizer getThreadedRegionizer() { -+ return new me.earthme.luminol.api.impl.ThreadedRegionizerImpl(this.world); ++ return this.world.regioniser.threadedRegionizerAPI; + } + // Luminol end } diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/ThreadedRegionImpl.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/ThreadedRegionImpl.java.patch index ec2d797..c9718e1 100644 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/ThreadedRegionImpl.java.patch +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/ThreadedRegionImpl.java.patch @@ -39,7 +39,7 @@ + + @Override + public TickRegionData getTickRegionData() { -+ return new TickRegionDataImpl(this.internal.getData()); ++ return this.internal.getData().tickRegionDataAPI; + } + + @Nullable diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/ThreadedRegionizerImpl.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/ThreadedRegionizerImpl.java.patch index 2a90d36..5556d45 100644 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/ThreadedRegionizerImpl.java.patch +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/ThreadedRegionizerImpl.java.patch @@ -40,7 +40,7 @@ + return null; + } + -+ return new ThreadedRegionImpl(got); ++ return got.threadedRegionAPI; + } + + @Override @@ -51,6 +51,6 @@ + return null; + } + -+ return new ThreadedRegionImpl(got); ++ return got.threadedRegionAPI; + } +} diff --git a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/TickRegionDataImpl.java.patch b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/TickRegionDataImpl.java.patch index c7e7d39..b64f1d7 100644 --- a/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/TickRegionDataImpl.java.patch +++ b/luminol-server/paper-patches/files/src/main/java/me/earthme/luminol/api/impl/TickRegionDataImpl.java.patch @@ -27,7 +27,7 @@ + + @Override + public RegionStats getRegionStats() { -+ return new RegionStatsImpl(this.internal.getRegionStats()); ++ return this.internal.getRegionStats().regionStatsAPI; + } + +}