From 9ab5b07c7842a7beb193247ddcab3634c0286586 Mon Sep 17 00:00:00 2001 From: Ben Kerllenevich Date: Wed, 8 Jun 2022 18:16:01 -0400 Subject: [PATCH] upstream --- gradle.properties | 2 +- patches/server/0003-Purpur-client-support.patch | 8 ++++---- patches/server/0005-Ridables.patch | 4 ++-- patches/server/0007-Timings-stuff.patch | 6 +++--- patches/server/0020-Alternative-Keepalive-Handling.patch | 4 ++-- patches/server/0077-Entity-lifespan.patch | 6 +++--- patches/server/0237-Signs-allow-color-codes.patch | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index 91558f91f..6ba9690f9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group = org.purpurmc.purpur version = 1.19-R0.1-SNAPSHOT -paperCommit = 86c16504d61cd3eda3ac480ddde638a352552d0e +paperCommit = da8027352cd717878213b1a0bb0ef7fb8916e5cf org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0003-Purpur-client-support.patch b/patches/server/0003-Purpur-client-support.patch index c6d9cb201..d77f64ecb 100644 --- a/patches/server/0003-Purpur-client-support.patch +++ b/patches/server/0003-Purpur-client-support.patch @@ -17,10 +17,10 @@ index 49a2a99bc0aaedb27524c64db5ce3907bf55cc28..062a06dbff672235acc87624f1b7c28f public double lastEntitySpawnRadiusSquared; // Paper - optimise isOutsideRange, this field is in blocks public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet cachedSingleHashSet; // Paper diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b53876746fcc23e7517da3287fdc58909865eb39..a7bc4eefd73337bfabb84032cd98aba42f5870fd 100644 +index 0c18cc24baf155aac072cfd0ea871d600e0550cb..0f41f7207ab38ed353800cb8cd621e9a93bbbea0 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3366,6 +3366,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3371,6 +3371,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser private static final ResourceLocation CUSTOM_UNREGISTER = new ResourceLocation("unregister"); private static final ResourceLocation MINECRAFT_BRAND = new ResourceLocation("brand"); // Paper - Brand support @@ -28,7 +28,7 @@ index b53876746fcc23e7517da3287fdc58909865eb39..a7bc4eefd73337bfabb84032cd98aba4 @Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { -@@ -3390,6 +3391,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3395,6 +3396,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t unregister custom payload", ex); this.disconnect("Invalid payload UNREGISTER!", org.bukkit.event.player.PlayerKickEvent.Cause.INVALID_PAYLOAD); // Paper - kick event cause } @@ -43,7 +43,7 @@ index b53876746fcc23e7517da3287fdc58909865eb39..a7bc4eefd73337bfabb84032cd98aba4 try { byte[] data = new byte[packet.data.readableBytes()]; diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 01ac24f0999c9829bffeb76c228779f80a571687..331d9b64fd3e005c8b95fe3c926f3691392a05dc 100644 +index 9bda669683a3062f99e798ea0a60d76373d46f4f..d87d521adbbc1c211f04bee0be15715948bde652 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -2768,4 +2768,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0005-Ridables.patch b/patches/server/0005-Ridables.patch index 26dac586e..e8d122125 100644 --- a/patches/server/0005-Ridables.patch +++ b/patches/server/0005-Ridables.patch @@ -66,10 +66,10 @@ index 54999c41a39e8c5baed67e01be3d28385d9f64b7..347c01f091144f82f6eed996d424400d public void doTick() { diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index a7bc4eefd73337bfabb84032cd98aba42f5870fd..076c482e6844f6a188267556cd8fbcc592ad53f7 100644 +index 0f41f7207ab38ed353800cb8cd621e9a93bbbea0..3c237c300af4e6e4fc304ac389baca261af13736 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2653,6 +2653,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -2658,6 +2658,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event); diff --git a/patches/server/0007-Timings-stuff.patch b/patches/server/0007-Timings-stuff.patch index a2226b63f..1f9f946e0 100644 --- a/patches/server/0007-Timings-stuff.patch +++ b/patches/server/0007-Timings-stuff.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Timings stuff diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java -index e2f60115370f19e935eb3b14d5de99aa4126c6b0..9948f685a073a0d82f10d36c298b9f0eed44ac59 100644 +index 78280fb3bcd8d792a58ece6d735e0824ea4be536..1789fdbd8b59f9d465ba0881481a578d5c7f9ec6 100644 --- a/src/main/java/co/aikar/timings/TimingsExport.java +++ b/src/main/java/co/aikar/timings/TimingsExport.java -@@ -234,9 +234,13 @@ public class TimingsExport extends Thread { +@@ -235,9 +235,13 @@ public class TimingsExport extends Thread { // Information on the users Config parent.put("config", createObject( @@ -24,7 +24,7 @@ index e2f60115370f19e935eb3b14d5de99aa4126c6b0..9948f685a073a0d82f10d36c298b9f0e )); new TimingsExport(listeners, parent, history).start(); -@@ -277,6 +281,19 @@ public class TimingsExport extends Thread { +@@ -278,6 +282,19 @@ public class TimingsExport extends Thread { return timingsCost; } diff --git a/patches/server/0020-Alternative-Keepalive-Handling.patch b/patches/server/0020-Alternative-Keepalive-Handling.patch index c594c5962..e0103367d 100644 --- a/patches/server/0020-Alternative-Keepalive-Handling.patch +++ b/patches/server/0020-Alternative-Keepalive-Handling.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Alternative Keepalive Handling diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index efc2204bd712449a93e132a19d31ae99b702972d..aa05998ef190e8ee9c3c1bfcb61d0daef81dee3b 100644 +index ae2b5d6ab0f18935c51ac94f5c5de32535a4241a..8359d93dbc4b0ee45741da62ed0e2b29e5b6c2b8 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -244,6 +244,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @@ -38,7 +38,7 @@ index efc2204bd712449a93e132a19d31ae99b702972d..aa05998ef190e8ee9c3c1bfcb61d0dae if (this.keepAlivePending) { if (!this.processedDisconnect && elapsedTime >= KEEPALIVE_LIMIT) { // check keepalive limit, don't fire if already disconnected ServerGamePacketListenerImpl.LOGGER.warn("{} was kicked due to keepalive timeout!", this.player.getScoreboardName()); // more info -@@ -3351,6 +3367,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3356,6 +3372,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0077-Entity-lifespan.patch b/patches/server/0077-Entity-lifespan.patch index a2065b7f3..e6ed6fb91 100644 --- a/patches/server/0077-Entity-lifespan.patch +++ b/patches/server/0077-Entity-lifespan.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Entity lifespan diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 19a98e6d3c3db6ac7f27adac766d6c8fbe3df491..baa02e8a9ed29854253ec03779ef9e5734d22104 100644 +index 816be58e98b26443b371ec5333d3878f1e66751b..ca27c557ab3e71f894f31131fa54860a82294d0d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2708,6 +2708,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -2713,6 +2713,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser } if (entity.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) { @@ -17,7 +17,7 @@ index 19a98e6d3c3db6ac7f27adac766d6c8fbe3df491..baa02e8a9ed29854253ec03779ef9e57 private void performInteraction(InteractionHand enumhand, ServerGamePacketListenerImpl.EntityInteraction playerconnection_a, PlayerInteractEntityEvent event) { // CraftBukkit ItemStack itemstack = ServerGamePacketListenerImpl.this.player.getItemInHand(enumhand).copy(); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 08d40550c898a63fb4ab37f5ed4807d19a4db13b..7dd8fdb921e8ad0a2d21f67241ed7c07614347a0 100644 +index 00911f1bc7ecbad931a9db83da071f4c684aba45..345c4c7087da5745995a76e3786d1f8173580b3b 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -134,6 +134,7 @@ public abstract class Mob extends LivingEntity { diff --git a/patches/server/0237-Signs-allow-color-codes.patch b/patches/server/0237-Signs-allow-color-codes.patch index aff4029c3..caab0f16b 100644 --- a/patches/server/0237-Signs-allow-color-codes.patch +++ b/patches/server/0237-Signs-allow-color-codes.patch @@ -17,10 +17,10 @@ index fb213ef136c6aff278426ade1ecd301407980016..f4aef2553bc50669772c27b342370677 this.connection.send(new ClientboundBlockUpdatePacket(this.level, sign.getBlockPos())); this.connection.send(new ClientboundOpenSignEditorPacket(sign.getBlockPos())); diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index c1ac9681c35b87b19a52f2306627e8f220b9c15f..a24c209150eb5a2f5b79a4e1596c376ffa58cf27 100644 +index e93dea51a27bf58560a9be7f0a5f3b68fd6cc51c..acd2277505b7f49caa991064c1a46ca6465d779d 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3375,11 +3375,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser +@@ -3380,11 +3380,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser for (int i = 0; i < signText.size(); ++i) { FilteredText filteredtext = (signText.get(i)).map(Component::literal); // CraftBukkit - decompile error