Skip to content

Commit 16bfbe3

Browse files
committed
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
1 parent 93177c4 commit 16bfbe3

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
22
version = 1.20.4-R0.1-SNAPSHOT
33

44
mcVersion = 1.20.4
5-
paperCommit = dd16335e40dc13843e8ae7c681ca0a166d2e54a0
5+
paperCommit = 7e15d977ecce23ee72b059e9be292d983a336c50
66

77
org.gradle.caching = true
88
org.gradle.parallel = true

patches/server/0273-Add-item-packet-serialize-event.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Add item packet serialize event
55

66

77
diff --git a/src/main/java/net/minecraft/network/FriendlyByteBuf.java b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
8-
index ff794499df6a2b65db2ca5956d2b98317592057f..fcfb7eb9b093896f11be4c13d450c522b3c47b15 100644
8+
index b13bc90b28b02f5e80d935bfcba727f92c5e4c4f..0cdc68722552a464fb828016eb93f865bc8bde54 100644
99
--- a/src/main/java/net/minecraft/network/FriendlyByteBuf.java
1010
+++ b/src/main/java/net/minecraft/network/FriendlyByteBuf.java
1111
@@ -95,6 +95,8 @@ public class FriendlyByteBuf extends ByteBuf {
@@ -17,7 +17,7 @@ index ff794499df6a2b65db2ca5956d2b98317592057f..fcfb7eb9b093896f11be4c13d450c522
1717
public FriendlyByteBuf(ByteBuf parent) {
1818
this.source = parent;
1919
}
20-
@@ -632,6 +634,17 @@ public class FriendlyByteBuf extends ByteBuf {
20+
@@ -635,6 +637,17 @@ public class FriendlyByteBuf extends ByteBuf {
2121
this.writeBoolean(false);
2222
} else {
2323
this.writeBoolean(true);
@@ -48,7 +48,7 @@ index e764ad7096852d8905422e8d0f140ed16c5b4498..39ecb12d4296852ee5865dcfa2b8b6c3
4848
while (iterator.hasNext()) {
4949
ServerLevel worldserver = (ServerLevel) iterator.next();
5050
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
51-
index 22020b5746988cf30385cc075c8e0b1309c99d69..6c5f5c19048ec52c088044f2bc34f54b937b1912 100644
51+
index 689ef8ad9548ac189d7b659d2557815640c8ef14..5ba429dd65a9795b73954b5d1e7d1f58adb04cb7 100644
5252
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
5353
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
5454
@@ -3372,6 +3372,12 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl

0 commit comments

Comments
 (0)