Repo-Mirror/LuminolMC
9
0
Fork 0
Code Issues Pull Requests Releases Activity

Set initial null comparator for scheduler api ticket by default

Browse Source
This commit is contained in:
MrHua269
2025-05-27 23:40:31 +08:00
parent bcd43da904
commit 97479a28d9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
luminol-server/minecraft-patches/features/0062-Use-old-registering-way-of-ticket-of-scheduler-api-o.patch → luminol-server/minecraft-patches/features/0062-Set-initial-null-comparator-for-scheduler-api-ticket.patch
View File

@@ -1,11 +1,12 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: MrHua269 <mrhua269@gmail.com> From: MrHua269 <mrhua269@gmail.com>
Date: Mon, 26 May 2025 23:48:32 +0800 Date: Mon, 26 May 2025 23:48:32 +0800
Subject: [PATCH] Use old registering way of ticket of scheduler api of folia 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 diff --git a/net/minecraft/server/level/TicketType.java b/net/minecraft/server/level/TicketType.java
index bbcb0fdf0cdf6f860897fe39d65019de19b3d758..99a5db75ae388caa804eadfcaed307c8bed419df 100644 index bbcb0fdf0cdf6f860897fe39d65019de19b3d758..ccaa07afb0f4153a0e76a0bfeaf75b98c8a08cc8 100644
--- a/net/minecraft/server/level/TicketType.java --- a/net/minecraft/server/level/TicketType.java
+++ b/net/minecraft/server/level/TicketType.java +++ b/net/minecraft/server/level/TicketType.java
@@ -57,7 +57,7 @@ public final class TicketType<T> implements ca.spottedleaf.moonrise.patches.chun @@ -57,7 +57,7 @@ public final class TicketType<T> implements ca.spottedleaf.moonrise.patches.chun
@@ -13,7 +14,7 @@ index bbcb0fdf0cdf6f860897fe39d65019de19b3d758..99a5db75ae388caa804eadfcaed307c8
public static final TicketType<Long> NETHER_PORTAL_DOUBLE_CHECK = ca.spottedleaf.moonrise.patches.chunk_system.ticket.ChunkSystemTicketType.create("folia:nether_portal_double_check", Long::compareTo); public static final TicketType<Long> NETHER_PORTAL_DOUBLE_CHECK = ca.spottedleaf.moonrise.patches.chunk_system.ticket.ChunkSystemTicketType.create("folia:nether_portal_double_check", Long::compareTo);
public static final TicketType<Long> TELEPORT_HOLD_TICKET = ca.spottedleaf.moonrise.patches.chunk_system.ticket.ChunkSystemTicketType.create("folia:teleport_hold_ticket", Long::compareTo); public static final TicketType<Long> 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);
+ public static final TicketType REGION_SCHEDULER_API_HOLD = ca.spottedleaf.moonrise.patches.chunk_system.ticket.ChunkSystemTicketType.create("folia:region_scheduler_api_hold", (a, b) -> 0); // Luminol - Use old registering way + 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 // Folia end - region threading
public static TicketType register(String name, long timeout, boolean persist, TicketType.TicketUse use) { public static TicketType register(String name, long timeout, boolean persist, TicketType.TicketUse use) {