Repo-Mirror/LeavesMC
9
0
Fork 0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-31 12:56:28 +00:00
Code Issues Releases Activity

Fix new update suppression crash

Browse Source
This commit is contained in:
violetc
2023-05-14 17:35:14 +08:00
parent e8a39ca637
commit 716855eef4
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0061-Fix-update-suppression-crash.patch
View File

@@ -4,6 +4,21 @@ Date: Fri, 17 Mar 2023 15:57:08 +0800
Subject: [PATCH] Fix update suppression crash
diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
index d2f0a0755317f5fa9a1ccf7db346aa77fd287d80..f013fb11379822c4ea307e233e30e1c293924fe1 100644
--- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java
+++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java
@@ -49,6 +49,10 @@ public class PacketUtils {
co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings
try (co.aikar.timings.Timing ignored = timing.startTiming()) { // Paper - timings
packet.handle(listener);
+ // Leaves start - update suppression crash fix
+ } catch (top.leavesmc.leaves.util.UpdateSuppressionException exception) {
+ top.leavesmc.leaves.LeavesLogger.LOGGER.info("An update suppression processed");
+ // Leaves start - update suppression crash fix
} catch (Exception exception) {
if (listener.shouldPropagateHandlingExceptions()) {
throw exception;
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 7c90cc6ceedd4103c210757b2cc8a6ee1f972a5b..dd3a4213d978180dfc54a779253081bb34323b9e 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java