Add generic ticket identifier

Currently only implemented for Plugin tickets as
all ticket add methods no longer include the identifier parameter.

This prevents plugin tickets from stepping over each other. If need
be, the ticket identifiers can be used for FUTURE_AWAIT and CHUNK_LOAD
and they should work.

Author: Spottedleaf

paper-server/patches/sources/io/papermc/paper/FeatureHooks.java.patch

@@ -148,7 +148,7 @@
 +        com.google.common.collect.ImmutableList.Builder<org.bukkit.plugin.Plugin> ret = com.google.common.collect.ImmutableList.builder();
 +        for (net.minecraft.server.level.Ticket ticket : tickets) {
 +            if (ticket.getType() == net.minecraft.server.level.TicketType.PLUGIN_TICKET) {
-+                ret.add((org.bukkit.plugin.Plugin) ticket.key);
++                ret.add((org.bukkit.plugin.Plugin) ticket.getIdentifier());
 +            }
 +        }
 +
@@ -173,7 +173,7 @@
 +                    chunk = world.getWorld().getChunkAt(ChunkPos.getX(chunkKey), ChunkPos.getZ(chunkKey));
 +                }
 +
-+                ret.computeIfAbsent((org.bukkit.plugin.Plugin) ticket.key, (key) -> com.google.common.collect.ImmutableList.builder()).add(chunk);
++                ret.computeIfAbsent((org.bukkit.plugin.Plugin) ticket.getIdentifier(), (key) -> com.google.common.collect.ImmutableList.builder()).add(chunk);
 +            }
 +        }
 +

paper-server/patches/sources/net/minecraft/server/level/Ticket.java.patch

@@ -1,16 +1,41 @@
 --- a/net/minecraft/server/level/Ticket.java
 +++ b/net/minecraft/server/level/Ticket.java
-@@ -66,4 +_,13 @@
-     public boolean isTimedOut() {
-         return this.type.hasTimeout() && this.ticksLeft < 0L;
-     }
+@@ -14,17 +_,36 @@
+                 ExtraCodecs.NON_NEGATIVE_INT.fieldOf("level").forGetter(Ticket::getTicketLevel),
+                 Codec.LONG.optionalFieldOf("ticks_left", 0L).forGetter(ticket -> ticket.ticksLeft)
+             )
+-            .apply(instance, Ticket::new)
++            .apply(instance, (type, level, ticks) -> new Ticket(type, level.intValue(), ticks.longValue())) // Paper - add identifier
+     );
+     private final TicketType type;
+     private final int ticketLevel;
+     private long ticksLeft;
++    // Paper start - add identifier
++    private Object identifier;
++
++    public Object getIdentifier() {
++        return this.identifier;
++    }
++    // Paper end - add identifier
 +
-+    // Paper start - plugin chunk tickets
-+    public [email protected] Plugin key;
-+    public Ticket withPluginRef(org.bukkit.plugin.Plugin plugin) {
-+        com.google.common.base.Preconditions.checkState(this.type == net.minecraft.server.level.TicketType.PLUGIN_TICKET);
-+        this.key = plugin;
-+        return this;
+ 
+     public Ticket(TicketType type, int ticketLevel) {
+-        this(type, ticketLevel, type.timeout());
++        // Paper start - add identifier
++        this(type, ticketLevel, null);
++    }
++    public Ticket(TicketType type, int ticketLevel, Object identifier) {
++        this(type, ticketLevel, type.timeout(), identifier);
++        // Paper end - add identifier
+     }
+ 
+     private Ticket(TicketType type, int ticketLevel, long ticksLeft) {
++        // Paper start - add identifier
++        this(type, ticketLevel, ticksLeft, null);
 +    }
-+    // Paper end - plugin chunk tickets
- }
++    private Ticket(TicketType type, int ticketLevel, long ticksLeft, Object identifier) {
++        this.identifier = identifier;
++        // Paper end - add identifier
+         this.type = type;
+         this.ticketLevel = ticketLevel;
+         this.ticksLeft = ticksLeft;

paper-server/patches/sources/net/minecraft/world/level/TicketStorage.java.patch

@@ -1,5 +1,14 @@
 --- a/net/minecraft/world/level/TicketStorage.java
 +++ b/net/minecraft/world/level/TicketStorage.java
+@@ -161,7 +_,7 @@
+     }
+ 
+     private static boolean isTicketSameTypeAndLevel(Ticket first, Ticket second) {
+-        return second.getType() == first.getType() && second.getTicketLevel() == first.getTicketLevel();
++        return second.getType() == first.getType() && second.getTicketLevel() == first.getTicketLevel() && java.util.Objects.equals(second.getIdentifier(), first.getIdentifier()); // Paper - add identifier
+     }
+ 
+     public int getTicketLevelAt(long chunkPos, boolean requireSimulation) {
 @@ -264,7 +_,7 @@
      }
 
@@ -16,16 +25,16 @@
 +    // Paper start
 +    public boolean addPluginRegionTicket(final ChunkPos pos, final org.bukkit.plugin.Plugin value) {
 +        // Keep inline with force loading
-+        return addTicket(pos.toLong(), new Ticket(TicketType.PLUGIN_TICKET, ChunkMap.FORCED_TICKET_LEVEL).withPluginRef(value));
++        return addTicket(pos.toLong(), new Ticket(TicketType.PLUGIN_TICKET, ChunkMap.FORCED_TICKET_LEVEL, value));
 +    }
 +
 +    public boolean removePluginRegionTicket(final ChunkPos pos, final org.bukkit.plugin.Plugin value) {
 +        // Keep inline with force loading
-+        return removeTicket(pos.toLong(), new Ticket(TicketType.PLUGIN_TICKET, ChunkMap.FORCED_TICKET_LEVEL).withPluginRef(value));
++        return removeTicket(pos.toLong(), new Ticket(TicketType.PLUGIN_TICKET, ChunkMap.FORCED_TICKET_LEVEL, value));
 +    }
 +
 +    public void removeAllPluginRegionTickets(TicketType ticketType, int ticketLevel, org.bukkit.plugin.Plugin ticketIdentifier) {
-+        removeTicketIf(ticket -> ticket.getType() == ticketType && ticket.getTicketLevel() == ticketLevel && ticket.key == ticketIdentifier, null);
++        removeTicketIf(ticket -> ticket.getType() == ticketType && ticket.getTicketLevel() == ticketLevel && ticket.getIdentifier() == ticketIdentifier, null);
 +    }
 +    // Paper end
  }