From 16bfbe332472d4a4bf6d069fc53dacd6421d7be8 Mon Sep 17 00:00:00 2001 From: granny Date: Tue, 12 Dec 2023 16:40:50 -0800 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@28abbaa Catch setEnabled to ensure classloader is properly unloaded (#10020) PaperMC/Paper@82f9280 Fix deprecated bungee APIs still serializing to JSON in packets (#10028) PaperMC/Paper@7c2dc4b Use Codecs for adventure Component conversions & network serialization (#10014) PaperMC/Paper@0fadaed [ci skip] move decomp fixes to correct patch PaperMC/Paper@dc3ef2a Fix vanilla components not being translated (#9893) PaperMC/Paper@7e15d97 Remove no longer needed diff from adventure patch --- gradle.properties | 2 +- patches/server/0273-Add-item-packet-serialize-event.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gradle.properties b/gradle.properties index ec639080a..97b3eed5d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.4-R0.1-SNAPSHOT mcVersion = 1.20.4 -paperCommit = dd16335e40dc13843e8ae7c681ca0a166d2e54a0 +paperCommit = 7e15d977ecce23ee72b059e9be292d983a336c50 org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0273-Add-item-packet-serialize-event.patch b/patches/server/0273-Add-item-packet-serialize-event.patch index aa323dbd6..f0fc9e76d 100644 --- a/patches/server/0273-Add-item-packet-serialize-event.patch +++ b/patches/server/0273-Add-item-packet-serialize-event.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add item packet serialize event diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java -index ff794499df6a2b65db2ca5956d2b98317592057f..fcfb7eb9b093896f11be4c13d450c522b3c47b15 100644 +index b13bc90b28b02f5e80d935bfcba727f92c5e4c4f..0cdc68722552a464fb828016eb93f865bc8bde54 100644 --- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java +++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java @@ -95,6 +95,8 @@ public class FriendlyByteBuf extends ByteBuf { @@ -17,7 +17,7 @@ index ff794499df6a2b65db2ca5956d2b98317592057f..fcfb7eb9b093896f11be4c13d450c522 public FriendlyByteBuf(ByteBuf parent) { this.source = parent; } -@@ -632,6 +634,17 @@ public class FriendlyByteBuf extends ByteBuf { +@@ -635,6 +637,17 @@ public class FriendlyByteBuf extends ByteBuf { this.writeBoolean(false); } else { this.writeBoolean(true); @@ -48,7 +48,7 @@ index e764ad7096852d8905422e8d0f140ed16c5b4498..39ecb12d4296852ee5865dcfa2b8b6c3 while (iterator.hasNext()) { ServerLevel worldserver = (ServerLevel) iterator.next(); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 22020b5746988cf30385cc075c8e0b1309c99d69..6c5f5c19048ec52c088044f2bc34f54b937b1912 100644 +index 689ef8ad9548ac189d7b659d2557815640c8ef14..5ba429dd65a9795b73954b5d1e7d1f58adb04cb7 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -3372,6 +3372,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl