From 6ed67711ba87e5c765775af226e7b971aa252e93 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Mon, 22 Jul 2024 13:17:47 +0800
Subject: [PATCH] Fix fast resume (#258)

---
 patches/server/0120-Fast-resume.patch | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/patches/server/0120-Fast-resume.patch b/patches/server/0120-Fast-resume.patch
index 32a425d3..2884aac9 100644
--- a/patches/server/0120-Fast-resume.patch
+++ b/patches/server/0120-Fast-resume.patch
@@ -80,10 +80,10 @@ index 19c0b7b95fb96978853f05ee1c6829613103acff..3f544556ba256d0a39fe9e1098a2e8ed
              if (this.hasStopped) return;
 diff --git a/src/main/java/org/leavesmc/leaves/util/TicketHelper.java b/src/main/java/org/leavesmc/leaves/util/TicketHelper.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..7f0f29dafd9a1262f76e068683256c494da3e886
+index 0000000000000000000000000000000000000000..36e9da7e68de086bc8572138eb14d0e00dc56879
 --- /dev/null
 +++ b/src/main/java/org/leavesmc/leaves/util/TicketHelper.java
-@@ -0,0 +1,174 @@
+@@ -0,0 +1,175 @@
 +package org.leavesmc.leaves.util;
 +
 +import ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader;
@@ -240,18 +240,19 @@ index 0000000000000000000000000000000000000000..7f0f29dafd9a1262f76e068683256c49
 +                ticketType = TicketType.PORTAL;
 +                key = BlockPos.of(json.get("key").getAsLong());
 +            }
-+            case "player_ticket" -> {
++            case "chunk_system:player_ticket" -> {
 +                ticketType = RegionizedPlayerChunkLoader.PLAYER_TICKET;
 +                key = json.get("key").getAsLong();
 +            }
 +        }
 +
 +        if (ticketType == null) {
-+            throw new IllegalArgumentException("???");
++            throw new IllegalArgumentException("Cant convert " + json.get("type").getAsString() + ", report it ???");
 +        }
 +
 +        int ticketLevel = json.get("ticketLevel").getAsInt();
 +        long removeDelay = json.get("removeDelay").getAsLong();
++        @SuppressWarnings("unchecked")
 +        Ticket<T> ticket = new Ticket<>((TicketType<T>) ticketType, ticketLevel, (T) key);
 +        ticket.moonrise$setRemoveDelay(removeDelay);
 +