diff --git a/build.gradle.kts b/build.gradle.kts index 2a46288e2..7de36f4a4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { java `maven-publish` id("com.github.johnrengelman.shadow") version "7.1.2" apply false - id("io.papermc.paperweight.patcher") version "1.4.0" + id("io.papermc.paperweight.patcher") version "1.4.1" } allprojects { diff --git a/patches/server/0278-Remove-Timings.patch b/patches/server/0278-Remove-Timings.patch index 1dcf2dd7a..21e17970b 100644 --- a/patches/server/0278-Remove-Timings.patch +++ b/patches/server/0278-Remove-Timings.patch @@ -64,29 +64,18 @@ index 01bdf134fc21220ab7ecca51f2dcd51c0b466bba..6bf14183a3fcd2b3d166752ce33240d2 } } diff --git a/src/main/java/net/minecraft/network/protocol/PacketUtils.java b/src/main/java/net/minecraft/network/protocol/PacketUtils.java -index 27d4aa45e585842c04491839826d405d6f447f0e..767623a35dda71d77c65602e10ef2b3f0ae743f1 100644 +index 27d4aa45e585842c04491839826d405d6f447f0e..b693a26ac6a5729bf91aca9ca0ae332b904d436f 100644 --- a/src/main/java/net/minecraft/network/protocol/PacketUtils.java +++ b/src/main/java/net/minecraft/network/protocol/PacketUtils.java -@@ -47,8 +47,9 @@ public class PacketUtils { +@@ -47,7 +47,7 @@ public class PacketUtils { if (MinecraftServer.getServer().hasStopped() || (listener instanceof ServerGamePacketListenerImpl && ((ServerGamePacketListenerImpl) listener).processedDisconnect)) return; // CraftBukkit, MC-142590 if (listener.getConnection().isConnected()) { co.aikar.timings.Timing timing = co.aikar.timings.MinecraftTimings.getPacketTiming(packet); // Paper - timings - try (co.aikar.timings.Timing ignored = timing.startTiming()) { // Paper - timings -+ //try (co.aikar.timings.Timing ignored = timing.startTiming()) { // Paper - timings // Purpur ++ try { // Paper - timings // Purpur packet.handle(listener); -+ /* // Purpur } catch (Exception exception) { net.minecraft.network.Connection networkmanager = listener.getConnection(); - String playerIP = io.papermc.paper.configuration.GlobalConfiguration.get().logging.logPlayerIpAddresses ? String.valueOf(networkmanager.getRemoteAddress()) : ""; // Paper -@@ -60,7 +61,7 @@ public class PacketUtils { - net.minecraft.network.chat.Component error = net.minecraft.network.chat.Component.literal("Packet processing error"); - networkmanager.send(new net.minecraft.network.protocol.game.ClientboundDisconnectPacket(error), net.minecraft.network.PacketSendListener.thenRun(() -> networkmanager.disconnect(error))); - networkmanager.setReadOnly(); -- } -+ } */ // Purpur - } else { - PacketUtils.LOGGER.debug("Ignoring packet due to disconnection: {}", packet); - } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 1be1aaa377d704634fe8e86c85877f374b27a0c9..58da87f8b01f438ab282d960026b7e4cc6c0b5a2 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java