diff --git a/paper-server/patches/features/0016-Moonrise-optimisation-patches.patch b/paper-server/patches/features/0016-Moonrise-optimisation-patches.patch index b7b43ba59ba..cdcf6022e2b 100644 --- a/paper-server/patches/features/0016-Moonrise-optimisation-patches.patch +++ b/paper-server/patches/features/0016-Moonrise-optimisation-patches.patch @@ -31125,7 +31125,7 @@ index 8afaded394fcbf5d7ad4c51ea49642ce93cd5198..e5ccfb8cbfafed7bb0a1d888b5bc98a9 } diff --git a/net/minecraft/world/level/TicketStorage.java b/net/minecraft/world/level/TicketStorage.java -index ac9d453df4bfa3cc50f1909e0d425e5ba98e6d75..669d347d90de6b083d56e995c7e3b022b54dd838 100644 +index ac9d453df4bfa3cc50f1909e0d425e5ba98e6d75..d2eafa1df04806d88baa76c1edc2c8cc6a5b30d8 100644 --- a/net/minecraft/world/level/TicketStorage.java +++ b/net/minecraft/world/level/TicketStorage.java @@ -29,7 +29,7 @@ import net.minecraft.world.level.saveddata.SavedData; @@ -31353,15 +31353,16 @@ index ac9d453df4bfa3cc50f1909e0d425e5ba98e6d75..669d347d90de6b083d56e995c7e3b022 - return ticket.isTimedOut(); - } - }, null); -+ ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)this.chunkMap.level).moonrise$getChunkTaskScheduler().chunkHolderManager.tick(); // Paper - rewrite chunk system ++ ((ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel)chunkMap.level).moonrise$getChunkTaskScheduler().chunkHolderManager.tick(); // Paper - rewrite chunk system this.setDirty(); } public void deactivateTicketsOnClosing() { - this.removeTicketIf((_long, ticket) -> ticket.getType() != TicketType.UNKNOWN && ticket.getType() != TicketType.CHUNK_LOAD && ticket.getType() != TicketType.FUTURE_AWAIT, this.deactivatedTickets); -- } -- -- public void removeTicketIf(BiPredicate biPredicate, @Nullable Long2ObjectOpenHashMap> map) { ++ // Paper - rewrite chunk system + } + + public void removeTicketIf(BiPredicate biPredicate, @Nullable Long2ObjectOpenHashMap> map) { - ObjectIterator>> objectIterator = this.tickets.long2ObjectEntrySet().fastIterator(); - boolean flag = false; - @@ -31410,13 +31411,10 @@ index ac9d453df4bfa3cc50f1909e0d425e5ba98e6d75..669d347d90de6b083d56e995c7e3b022 - } - } - } -+ // Paper - rewrite chunk system -+ } - +- - if (flag) { - this.updateForcedChunks(); - } -+ public void removeTicketIf(Predicate predicate, @Nullable Long2ObjectOpenHashMap> tickets) { + throw new UnsupportedOperationException(); // Paper - rewrite chunk system }