Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-21 15:59:33 +00:00
Code Issues Releases Activity

Fix fast resume (#258)

Browse Source
This commit is contained in:
violetc
2024-07-22 13:17:47 +08:00
parent 103beaa773
commit 6ed67711ba
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/server/0120-Fast-resume.patch
View File

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