Skip to content

Commit

Permalink
fix MORE patches
Browse files Browse the repository at this point in the history
  • Loading branch information
@MC-XiaoHei
MC-XiaoHei committed May 10, 2024
1 parent caec005 commit 8bb3f63
Show file tree
Hide file tree
Showing 5 changed files with 225 additions and 14 deletions.
39 changes: 39 additions & 0 deletions patches/server/0053-Fix-update-suppression-crash.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,3 +83,42 @@ index e679b40b9628b0eb7152978ef641f9c918c4c8b2..2282af2dc71687c63de7893aef766dff
CrashReport crashreport = CrashReport.forThrowable(throwable, "Exception while updating neighbours");
CrashReportCategory crashreportsystemdetails = crashreport.addCategory("Block being updated");

diff --git a/src/main/java/top/leavesmc/leaves/util/UpdateSuppressionException.java b/src/main/java/top/leavesmc/leaves/util/UpdateSuppressionException.java
new file mode 100644
index 0000000000000000000000000000000000000000..f9a9f3e28bebdaa5038ebf81ac53447182c2bc10
--- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/util/UpdateSuppressionException.java
@@ -0,0 +1,33 @@
+package top.leavesmc.leaves.util;
+
+import net.minecraft.core.BlockPos;
+
+public class UpdateSuppressionException extends RuntimeException {
+
+ private final BlockPos pos;
+ private final BlockPos source;
+
+ public UpdateSuppressionException(BlockPos pos, BlockPos source) {
+ super("Update suppression");
+ this.pos = pos;
+ this.source = source;
+ }
+
+ public BlockPos getPos() {
+ return pos;
+ }
+
+ public BlockPos getSource() {
+ return source;
+ }
+
+ public String getMessage() {
+ if (pos != null) {
+ return "An update suppression processed, form [x:%d,y:%d,z:%d] to [x:%d,y:%d,z:%d]"
+ .formatted(source.getX(), source.getY(), source.getZ(), pos.getX(), pos.getY(), pos.getZ());
+ } else {
+ return "An update suppression processed, form [x:%d,y:%d,z:%d]"
+ .formatted(source.getX(), source.getY(), source.getZ());
+ }
+ }
+}
185 changes: 185 additions & 0 deletions patches/server/0129-Fast-resume.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,3 +85,188 @@ index 7952507524e08afa669815561c5ff5b8782a0b44..27e88a4d468addff78a40977758e447a
// CraftBukkit start - prevent double stopping on multiple threads
synchronized(this.stopLock) {
if (this.hasStopped) return;
diff --git a/src/main/java/top/leavesmc/leaves/util/TicketHelper.java b/src/main/java/top/leavesmc/leaves/util/TicketHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..9ab241f6a3d7d57bb6a8cdc222021fd0c2b499e5
--- /dev/null
+++ b/src/main/java/top/leavesmc/leaves/util/TicketHelper.java
@@ -0,0 +1,179 @@
+package top.leavesmc.leaves.util;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader;
+import it.unimi.dsi.fastutil.longs.Long2ObjectMap;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.DistanceManager;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.Ticket;
+import net.minecraft.server.level.TicketType;
+import net.minecraft.util.SortedArraySet;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.storage.LevelResource;
+import top.leavesmc.leaves.LeavesConfig;
+
+import java.io.BufferedReader;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.Set;
+
+public class TicketHelper {
+
+ private static final Set<TicketType<?>> NEED_SAVED = Set.of(TicketType.PLAYER, TicketType.PORTAL, TicketType.ENTITY_LOAD, TicketType.POI_LOAD);
+
+ public static void tryToLoadTickets() {
+ if (!LeavesConfig.fastResume) {
+ return;
+ }
+
+ File file = MinecraftServer.getServer().getWorldPath(LevelResource.ROOT).resolve("chunk_tickets.leaves.json").toFile();
+ if (file.isFile()) {
+ try (BufferedReader bfr = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) {
+ JsonObject json = new Gson().fromJson(bfr, JsonObject.class);
+ loadSavedChunkTickets(json);
+ file.delete();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ public static void tryToSaveTickets() {
+ if (!LeavesConfig.fastResume) {
+ return;
+ }
+
+ File file = MinecraftServer.getServer().getWorldPath(LevelResource.ROOT).resolve("chunk_tickets.leaves.json").toFile();
+ if (!file.isFile()) {
+ try {
+ file.createNewFile();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ try (BufferedWriter bfw = Files.newBufferedWriter(file.toPath(), StandardCharsets.UTF_8)) {
+ bfw.write(new Gson().toJson(getSavedChunkTickets()));
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+
+ public static void loadSavedChunkTickets(JsonObject json) {
+ MinecraftServer server = MinecraftServer.getServer();
+ for (String worldKey : json.keySet()) {
+ ServerLevel level = server.getLevel(ResourceKey.create(Registries.DIMENSION, new ResourceLocation(worldKey)));
+ if (level == null) {
+ continue;
+ }
+
+ DistanceManager chunkDistanceManager = level.getChunkSource().chunkMap.distanceManager;
+ for (JsonElement chunkElement : json.get(worldKey).getAsJsonArray()) {
+ JsonObject chunkJson = (JsonObject) chunkElement;
+ long chunkKey = chunkJson.get("key").getAsLong();
+
+ for (JsonElement ticketElement : chunkJson.get("tickets").getAsJsonArray()) {
+ Ticket<?> ticket = tickFormJson((JsonObject) ticketElement);
+ chunkDistanceManager.getChunkHolderManager().addTicketAtLevelCustom(ticket, chunkKey, true);
+ }
+ }
+ }
+ }
+
+ public static JsonObject getSavedChunkTickets() {
+ JsonObject json = new JsonObject();
+
+ for (ServerLevel level : MinecraftServer.getServer().getAllLevels()) {
+ JsonArray levelArray = new JsonArray();
+ DistanceManager chunkDistanceManager = level.getChunkSource().chunkMap.distanceManager;
+
+ for (Long2ObjectMap.Entry<SortedArraySet<Ticket<?>>> chunkTickets : chunkDistanceManager.getChunkHolderManager().getTicketsCopy().long2ObjectEntrySet()) {
+ long chunkKey = chunkTickets.getLongKey();
+ JsonArray ticketArray = new JsonArray();
+ SortedArraySet<Ticket<?>> tickets = chunkTickets.getValue();
+
+ for (Ticket<?> ticket : tickets) {
+ if (!NEED_SAVED.contains(ticket.getType())) {
+ continue;
+ }
+
+ ticketArray.add(ticketToJson(ticket));
+ }
+
+ if (!ticketArray.isEmpty()) {
+ JsonObject chunkJson = new JsonObject();
+ chunkJson.addProperty("key", chunkKey);
+ chunkJson.add("tickets", ticketArray);
+ levelArray.add(chunkJson);
+ }
+ }
+
+ if (!levelArray.isEmpty()) {
+ json.add(level.dimension().location().toString(), levelArray);
+ }
+ }
+
+ return json;
+ }
+
+ private static JsonObject ticketToJson(Ticket<?> ticket) {
+ JsonObject json = new JsonObject();
+ json.addProperty("type", ticket.getType().toString());
+ json.addProperty("ticketLevel", ticket.getTicketLevel());
+ json.addProperty("removeDelay", ticket.removeDelay);
+ if (ticket.key instanceof BlockPos pos) {
+ json.addProperty("key", pos.asLong());
+ } else if (ticket.key instanceof ChunkPos pos) {
+ json.addProperty("key", pos.toLong());
+ } else if (ticket.key instanceof Long l) {
+ json.addProperty("key", l);
+ }
+ return json;
+ }
+
+ private static <T> Ticket<T> tickFormJson(JsonObject json) {
+ TicketType<?> ticketType = null;
+ Object key = null;
+ switch (json.get("type").getAsString()) {
+ case "player" -> {
+ ticketType = TicketType.PLAYER;
+ key = new ChunkPos(json.get("key").getAsLong());
+ }
+ case "portal" -> {
+ ticketType = TicketType.PORTAL;
+ key = BlockPos.of(json.get("key").getAsLong());
+ }
+ case "entity_load" -> {
+ ticketType = TicketType.ENTITY_LOAD;
+ key = json.get("key").getAsLong();
+ }
+ case "poi_load" -> {
+ ticketType = TicketType.POI_LOAD;
+ key = json.get("key").getAsLong();
+ }
+ case "region_player_ticket" -> {
+ ticketType = RegionizedPlayerChunkLoader.REGION_PLAYER_TICKET;
+ key = json.get("key").getAsLong();
+ }
+ }
+
+ if (ticketType == null) {
+ throw new IllegalArgumentException("???");
+ }
+
+ int ticketLevel = json.get("ticketLevel").getAsInt();
+ long removeDelay = json.get("removeDelay").getAsLong();
+
+ return new Ticket<T>((TicketType<T>) ticketType, ticketLevel, (T) key, removeDelay);
+ }
+}
13 changes: 0 additions & 13 deletions patches/server/0132-Fix-falling-block-s-block-location.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,6 @@ Date: Fri, 16 Feb 2024 19:50:03 +0800
Subject: [PATCH] Fix falling block's block location


diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 27e88a4d468addff78a40977758e447a0ce0b227..8150d8d6413eed8221939a850093b2f449a61f3b 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -674,7 +674,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
}
// Paper end - Configurable player collision

- top.leavesmc.leaves.util.TicketHelper.tryToLoadTickets(); // Leaves - load ticket
+ top.leavesmc.leaves.util.TicketHelper.tryToLoadTickets(); // Leaves - load ticket
this.server.enablePlugins(org.bukkit.plugin.PluginLoadOrder.POSTWORLD);
this.server.getPluginManager().callEvent(new ServerLoadEvent(ServerLoadEvent.LoadType.STARTUP));
if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8076f3d8d677091581b46551605cba9984932356..4b9227ab190518b2d2f2b9e5d6b3b3c13251154b 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java
Expand Down
2 changes: 1 addition & 1 deletion patches/server/0134-Fix-next-steps.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Subject: [PATCH] Fix next steps


diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 8150d8d6413eed8221939a850093b2f449a61f3b..e290195587fc800268ee191591651295db79a139 100644
index 27e88a4d468addff78a40977758e447a0ce0b227..11feae4b06c349ec01d7776d73a2d18f8ecac783 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1166,7 +1166,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
Expand Down
0 patches/api/0011-Bytebuf-API.patch → patches/unapplied/api/0011-Bytebuf-API.patch
View file
File renamed without changes.

0 comments on commit 8bb3f63

Please sign in to comment.