diff --git a/gradle.properties b/gradle.properties index 7a460e1..f82f14a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = me.earthme.luminol version=1.21.5-R0.1-SNAPSHOT mcVersion=1.21.5 -foliaRef=70f4f3ad9b40fce3d12ad5dc9672d95a96f041d3 +foliaRef=c9ed45fd343b9b831a49456a65fb2d9c785783f7 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/luminol-server/minecraft-patches/features/0062-Set-initial-null-comparator-for-scheduler-api-ticket.patch b/luminol-server/minecraft-patches/features/0062-Set-initial-null-comparator-for-scheduler-api-ticket.patch deleted file mode 100644 index bc91f6a..0000000 --- a/luminol-server/minecraft-patches/features/0062-Set-initial-null-comparator-for-scheduler-api-ticket.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MrHua269 -Date: Mon, 26 May 2025 23:48:32 +0800 -Subject: [PATCH] Set initial null comparator for scheduler api ticket by - default - - -diff --git a/net/minecraft/server/level/TicketType.java b/net/minecraft/server/level/TicketType.java -index bbcb0fdf0cdf6f860897fe39d65019de19b3d758..ccaa07afb0f4153a0e76a0bfeaf75b98c8a08cc8 100644 ---- a/net/minecraft/server/level/TicketType.java -+++ b/net/minecraft/server/level/TicketType.java -@@ -57,7 +57,7 @@ public final class TicketType implements ca.spottedleaf.moonrise.patches.chun - public static final TicketType END_GATEWAY_EXIT_SEARCH = ca.spottedleaf.moonrise.patches.chunk_system.ticket.ChunkSystemTicketType.create("folia:end_gateway_exit_search", Long::compareTo); - public static final TicketType NETHER_PORTAL_DOUBLE_CHECK = ca.spottedleaf.moonrise.patches.chunk_system.ticket.ChunkSystemTicketType.create("folia:nether_portal_double_check", Long::compareTo); - public static final TicketType TELEPORT_HOLD_TICKET = ca.spottedleaf.moonrise.patches.chunk_system.ticket.ChunkSystemTicketType.create("folia:teleport_hold_ticket", Long::compareTo); -- public static final TicketType REGION_SCHEDULER_API_HOLD = register("folia:region_scheduler_api_hold", 0L, false, TicketType.TicketUse.LOADING_AND_SIMULATION); -+ public static final TicketType REGION_SCHEDULER_API_HOLD = register("folia:region_scheduler_api_hold", 0L, false, TicketType.TicketUse.LOADING_AND_SIMULATION); static {((TicketType)REGION_SCHEDULER_API_HOLD).moonrise$setIdentifierComparator((unused, unused2) -> 0);} // Luminol - Set initial null comparator for scheduler api ticket by default to prevent null comparator error - // Folia end - region threading - - public static TicketType register(String name, long timeout, boolean persist, TicketType.TicketUse use) {