From 8fec60c7bc577a5b97aaf52154561ff365bb1850 Mon Sep 17 00:00:00 2001 From: granny Date: Thu, 20 Jul 2023 00:01:51 -0700 Subject: [PATCH] Updated Upstream (Paper) Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@c793bd9 Allow LEFT_CLICK_AIR in 3.0->4.5 range of entity (#9211) PaperMC/Paper@40adc23 [ci skip] Fix incorrect javadoc in JarLibrary (#9513) PaperMC/Paper@c016e03 Fix unbreakable flint and steel consumed when igniting creepers (#9509) --- gradle.properties | 2 +- patches/server/0001-Pufferfish-Server-Changes.patch | 8 ++++---- patches/server/0005-Purpur-client-support.patch | 8 ++++---- patches/server/0008-Ridables.patch | 6 +++--- patches/server/0020-Alternative-Keepalive-Handling.patch | 4 ++-- patches/server/0073-Entity-lifespan.patch | 4 ++-- patches/server/0281-Add-item-packet-serialize-event.patch | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8b98b5fb6..e0c6c9039 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = org.purpurmc.purpur version = 1.20.1-R0.1-SNAPSHOT mcVersion = 1.20.1 -paperCommit = b533905cc3b3360e67fa6140575ebbef52314bb8 +paperCommit = c016e039a5b7c0e86a2862235451b09a315d12cc org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Pufferfish-Server-Changes.patch b/patches/server/0001-Pufferfish-Server-Changes.patch index d61c687c1..29bcbcf62 100644 --- a/patches/server/0001-Pufferfish-Server-Changes.patch +++ b/patches/server/0001-Pufferfish-Server-Changes.patch @@ -1456,10 +1456,10 @@ index 0000000000000000000000000000000000000000..facd55463d44cb7e3d2ca6892982f549 + } +} diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java -index 2d11a67bdc82088abf0b3ca134f352f155c8eb1f..8bd24c8eef3169a765d42a676903446011a15be8 100644 +index cb4379268b191d331c71be44642baac381ffaaf6..b8efbdea3254c38f2c365249b87b0b2c8947e536 100644 --- a/src/main/java/io/papermc/paper/util/MCUtil.java +++ b/src/main/java/io/papermc/paper/util/MCUtil.java -@@ -210,7 +210,7 @@ public final class MCUtil { +@@ -211,7 +211,7 @@ public final class MCUtil { } public static long getCoordinateKey(final Entity entity) { @@ -1520,7 +1520,7 @@ index 9f422cbeaa52b3e6a0a27af4f8ad4ddb7808483f..28af96ce4f9f1a83316b6fd9e1625c71 } } diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 9209b598d7168b82574e4800056b8b9f84265dd0..d304f01766bba9b3e9fcd30a7ae4730fd7188875 100644 +index 469083208110d5735e1bbda7a15c55a032d0e8cc..68ac88b150ae5fa5e18958a5e2a83b00a26258ae 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -342,7 +342,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider @@ -1791,7 +1791,7 @@ index 9d46536f80b5b3e6641fd377c02166a431edfd77..8a1fde50b82a8b0718ae04124c2611b7 @Override diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index b777547cb9f8edf4e7b3c2cfb894f8cd1b1a35a5..85d6635da9e7cb896d5d507dd9f8fb5d092a740e 100644 +index 316740b2ba4c85828f544249c8cdd6fa1b525d3f..22d2e0e262cbc9b0c95e9978adf5561df4774d25 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -1219,6 +1219,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic diff --git a/patches/server/0005-Purpur-client-support.patch b/patches/server/0005-Purpur-client-support.patch index 51a33aae3..b471a0007 100644 --- a/patches/server/0005-Purpur-client-support.patch +++ b/patches/server/0005-Purpur-client-support.patch @@ -17,10 +17,10 @@ index 8a1fde50b82a8b0718ae04124c2611b7cff4bcd6..d4e03454b07550621dd1a56e4eaa40f3 private final java.util.concurrent.atomic.AtomicReference viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1)); public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader; diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -index 85d6635da9e7cb896d5d507dd9f8fb5d092a740e..bd6798a03a1349de4b5589b05cef167034250c1e 100644 +index 22d2e0e262cbc9b0c95e9978adf5561df4774d25..b70936913ccf220416eca8ffafa5d97e6290c613 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3508,6 +3508,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3515,6 +3515,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic 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 85d6635da9e7cb896d5d507dd9f8fb5d092a740e..bd6798a03a1349de4b5589b05cef1670 @Override public void handleCustomPayload(ServerboundCustomPayloadPacket packet) { -@@ -3532,6 +3533,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3539,6 +3540,13 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic 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 85d6635da9e7cb896d5d507dd9f8fb5d092a740e..bd6798a03a1349de4b5589b05cef1670 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 5b201d2c21f04e0223970035e0631f8f92ea0d3a..1c5dc1727b1731ddfd2f6b0e36618b780b9aa930 100644 +index dbdeb913e228651cadf5dbd7ec98afc738c80522..e77d519a25aef117515fdb463ca3e124ee028c83 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -3180,4 +3180,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player { diff --git a/patches/server/0008-Ridables.patch b/patches/server/0008-Ridables.patch index a0d553c1b..88e59c8ce 100644 --- a/patches/server/0008-Ridables.patch +++ b/patches/server/0008-Ridables.patch @@ -66,10 +66,10 @@ index a0577dcae567230c12b52ed02072745513c7a4d5..23235b98907ff26afb22d37326b072ba 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 bd6798a03a1349de4b5589b05cef167034250c1e..8c62cc52c2d2aaa1dd1f191114e188c22e4f40a2 100644 +index b70936913ccf220416eca8ffafa5d97e6290c613..d88abd13d215bcfaefae918e76f9658224c7aa2f 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2811,6 +2811,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2818,6 +2818,8 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic ServerGamePacketListenerImpl.this.cserver.getPluginManager().callEvent(event); @@ -3257,7 +3257,7 @@ index da48bd8e15463be8170262ae90a8e95575959bf2..34abd8093015d7cdaf2faca2396d3950 public boolean doHurtTarget(Entity target) { if (super.doHurtTarget(target)) { diff --git a/src/main/java/net/minecraft/world/entity/monster/Creeper.java b/src/main/java/net/minecraft/world/entity/monster/Creeper.java -index 7fe90ebc8eced53f72c7f935e40745075f02421b..5017a82ced2ea5b7a58fa54c5898b83c5746a2b9 100644 +index fd1b5a1beea7594fa65decfdcccfa15781fc005b..66b2fdcda53fdfd278994dc16be3e12041be6e99 100644 --- a/src/main/java/net/minecraft/world/entity/monster/Creeper.java +++ b/src/main/java/net/minecraft/world/entity/monster/Creeper.java @@ -59,21 +59,98 @@ public class Creeper extends Monster implements PowerableMob { diff --git a/patches/server/0020-Alternative-Keepalive-Handling.patch b/patches/server/0020-Alternative-Keepalive-Handling.patch index 2e3114873..d6e4812ce 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 bad43ba1a75015a06bd39ce654b82f8d10b9c326..eb57d8773dc352d13165dd2fd35d6d644f801c54 100644 +index d91fd3fa0f08dc43641ad628f26be123548ddf4e..bcce3550b8bde5eb9b187e99349044e7a9538e5a 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java @@ -263,6 +263,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @@ -38,7 +38,7 @@ index bad43ba1a75015a06bd39ce654b82f8d10b9c326..eb57d8773dc352d13165dd2fd35d6d64 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 -@@ -3493,6 +3509,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3500,6 +3516,16 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic @Override public void handleKeepAlive(ServerboundKeepAlivePacket packet) { diff --git a/patches/server/0073-Entity-lifespan.patch b/patches/server/0073-Entity-lifespan.patch index 75105fc65..0828e07d3 100644 --- a/patches/server/0073-Entity-lifespan.patch +++ b/patches/server/0073-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 4a1fad0befda6f0c774baf06af02c3711ac0ea5a..97cf67d7e1fafd49f99cb70e4c6cad3acf4581a2 100644 +index aaff9ea822da6f700a3576473f45402e1cc2b5e4..d723670c96890bce35642de3611c3641992e112b 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -2863,6 +2863,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -2870,6 +2870,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic AABB axisalignedbb = entity.getBoundingBox(); if (axisalignedbb.distanceToSqr(this.player.getEyePosition()) < ServerGamePacketListenerImpl.MAX_INTERACTION_DISTANCE) { diff --git a/patches/server/0281-Add-item-packet-serialize-event.patch b/patches/server/0281-Add-item-packet-serialize-event.patch index f665f56ae..32b03e802 100644 --- a/patches/server/0281-Add-item-packet-serialize-event.patch +++ b/patches/server/0281-Add-item-packet-serialize-event.patch @@ -48,10 +48,10 @@ index 5e4486c4b273b26afb82a97f914358b6a6c18229..6afdf37406d7dae04a7fec94e0c39d51 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 c5322ebd837c498056978840274e6a153cf3f56e..1c2824d48fc516e45a99821ee18e0246d31651a8 100644 +index 480536a4ad3049d530feb023788104209d64e202..87ba51562d9c513dbe6e662020fcbc80e24055ba 100644 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java -@@ -3458,6 +3458,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic +@@ -3465,6 +3465,12 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic } } }