Skip to content

Commit e0ba395

Browse files
committed
Add missing plugin ticket comparator fixes #13130
1 parent a3f247c commit e0ba395

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

paper-server/patches/features/0001-Moonrise-optimisation-patches.patch

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27418,7 +27418,7 @@ index a663c84c756bc59aaddbceda939f552e8a422e60..c3a923b7292e970cbfcde7b9fedcbb6e
2741827418

2741927419
public TicketType getType() {
2742027420
diff --git a/net/minecraft/server/level/TicketType.java b/net/minecraft/server/level/TicketType.java
27421-
index f8fa59d2f1090fe0e3e34dab0f86933101feb59e..e3a4b57f374bbe9792d86e60da1a115abcc9cd66 100644
27421+
index f8fa59d2f1090fe0e3e34dab0f86933101feb59e..25ea504fa93f78b43237e1c79f8b5685a2aa6d7c 100644
2742227422
--- a/net/minecraft/server/level/TicketType.java
2742327423
+++ b/net/minecraft/server/level/TicketType.java
2742427424
@@ -3,7 +3,45 @@ package net.minecraft.server.level;
@@ -27468,6 +27468,15 @@ index f8fa59d2f1090fe0e3e34dab0f86933101feb59e..e3a4b57f374bbe9792d86e60da1a115a
2746827468
public static final long NO_TIMEOUT = 0L;
2746927469
public static final int FLAG_PERSIST = 1;
2747027470
public static final int FLAG_LOADING = 2;
27471+
@@ -21,7 +59,7 @@ public record TicketType(long timeout, int flags) {
27472+
public static final TicketType UNKNOWN = register("unknown", 1L, 18);
27473+
public static final TicketType PLUGIN = register("plugin", 0L, FLAG_LOADING | FLAG_SIMULATION); // CraftBukkit
27474+
public static final TicketType POST_TELEPORT = register("post_teleport", 5L, FLAG_LOADING | FLAG_SIMULATION); // Paper
27475+
- public static final TicketType PLUGIN_TICKET = register("plugin_ticket", NO_TIMEOUT, FLAG_LOADING | FLAG_SIMULATION); // Paper
27476+
+ public static final TicketType PLUGIN_TICKET = register("plugin_ticket", NO_TIMEOUT, FLAG_LOADING | FLAG_SIMULATION); static { ((TicketType<org.bukkit.plugin.Plugin>)PLUGIN_TICKET).moonrise$setIdentifierComparator((org.bukkit.plugin.Plugin p1, org.bukkit.plugin.Plugin p2) -> p1.getName().compareTo(p2.getName())); } // Paper // Paper - rewrite chunk system
27477+
public static final TicketType FUTURE_AWAIT = register("future_await", NO_TIMEOUT, FLAG_LOADING | FLAG_SIMULATION); // Paper
27478+
public static final TicketType CHUNK_LOAD = register("chunk_load", NO_TIMEOUT, FLAG_LOADING); // Paper - moonrise
27479+
2747127480
@@ -49,9 +87,44 @@ public record TicketType(long timeout, int flags) {
2747227481
return (this.flags & 16) != 0;
2747327482
}

0 commit comments

Comments
 (0)