From 913479978fbbab3d625a85b06121aff3ebd01d86 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Sat, 30 Sep 2023 13:59:37 +0800 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- patches/server/0001-Build-changes.patch | 2 +- patches/server/0002-Delete-Timings.patch | 4 ++-- patches/server/0005-Leaves-Server-Config-And-Command.patch | 2 +- .../server/0013-Add-isShrink-to-EntityResurrectEvent.patch | 2 +- .../server/0016-Stick-can-change-ArmorStand-arm-status.patch | 2 +- patches/server/0020-Dont-send-useless-entity-packets.patch | 2 +- patches/server/0024-Optimize-suffocation.patch | 2 +- patches/server/0037-Cache-climbing-check-for-activation.patch | 2 +- patches/server/0052-Return-nether-portal-fix.patch | 2 +- patches/server/0092-Reduce-array-allocations.patch | 4 ++-- .../server/0098-Check-frozen-ticks-before-landing-block.patch | 2 +- .../server/0125-Armor-stand-cant-kill-by-mob-projectile.patch | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/gradle.properties b/gradle.properties index b6cc6e03..6fef6465 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ version=1.20.2-R0.1-SNAPSHOT mcVersion=1.20.2 packageVersion=1_20_R2 org.gradle.jvmargs=-Xmx2G -paperRef=1765917a6f25b4a954231aff8f4f9f0b630594d4 +paperRef=0f69290f07f16e7423f82dc2d3f4d258af0e2f44 preVersion=true diff --git a/patches/server/0001-Build-changes.patch b/patches/server/0001-Build-changes.patch index 36c06f7f..3216698c 100644 --- a/patches/server/0001-Build-changes.patch +++ b/patches/server/0001-Build-changes.patch @@ -206,7 +206,7 @@ index fcd5096d64edfaf6bce3ecce8c9b9afb84462786..fab14ca6965d903df220e0f7d0e73e20 private final String bukkitVersion = Versioning.getBukkitVersion(); private final Logger logger = Logger.getLogger("Minecraft"); diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index e7746952417a3ca4ea97103e38568db42039f717..cd92954cb2f622fbbfa8b0a9ec82bb15fd5af371 100644 +index e4cacb17f56c618bef19e1165c07aac86af61150..328cb5980b0d3a15b4fc2b50be10d9b501f7ec27 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -300,7 +300,7 @@ public class Main { diff --git a/patches/server/0002-Delete-Timings.patch b/patches/server/0002-Delete-Timings.patch index d5c96a45..c9a96802 100644 --- a/patches/server/0002-Delete-Timings.patch +++ b/patches/server/0002-Delete-Timings.patch @@ -1709,7 +1709,7 @@ index 73871f456a85bda1e51f54986d0e61fb629822e8..7dbb55953ce9fb489c8a6706bc8a64fd return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index c039c77d0dd6ec1d336948ca6b5351d6fae1d8bb..3920d629a8db4f5e029bddb2da51772e328cf937 100644 +index 77a1c7dfbaccc2e74da5c78ce4dfcd1717a7ac65..7b395528b8e0853c6b3e040526edad07e54c02ba 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -142,7 +142,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -1991,7 +1991,7 @@ index 4abec88caab4116cfa318f7b66c6b1a8346a7401..8bb33965605ee1fdd5d37662f147dcc4 } } diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index cd92954cb2f622fbbfa8b0a9ec82bb15fd5af371..07b79c811727e8a26f7c34908e9b2a6eb2fbea9e 100644 +index 328cb5980b0d3a15b4fc2b50be10d9b501f7ec27..a6e72d29f3168cbc252f7013b15b3678e65ae38d 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -342,8 +342,8 @@ public class Main { diff --git a/patches/server/0005-Leaves-Server-Config-And-Command.patch b/patches/server/0005-Leaves-Server-Config-And-Command.patch index 0bcee048..ef39500e 100644 --- a/patches/server/0005-Leaves-Server-Config-And-Command.patch +++ b/patches/server/0005-Leaves-Server-Config-And-Command.patch @@ -111,7 +111,7 @@ index fab14ca6965d903df220e0f7d0e73e20cfb5f2b1..c7120a96ae8277dceecb3f7953423f40 @Override public void restart() { diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java -index 07b79c811727e8a26f7c34908e9b2a6eb2fbea9e..cfdad68eb410690f57fd4ebfb1c270827bec5685 100644 +index a6e72d29f3168cbc252f7013b15b3678e65ae38d..c42d7526b37d0e11ce8f2b16fa03061df8199fd1 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java +++ b/src/main/java/org/bukkit/craftbukkit/Main.java @@ -165,6 +165,14 @@ public class Main { diff --git a/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch b/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch index f151a79d..8a7cbbcd 100644 --- a/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch +++ b/patches/server/0013-Add-isShrink-to-EntityResurrectEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add isShrink to EntityResurrectEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 3920d629a8db4f5e029bddb2da51772e328cf937..293abc70b7a447a35835192a1f4333bbac8e88fc 100644 +index 7b395528b8e0853c6b3e040526edad07e54c02ba..79f56995e30dd0091a514d3f90603a83de0e754f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -1608,12 +1608,12 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0016-Stick-can-change-ArmorStand-arm-status.patch b/patches/server/0016-Stick-can-change-ArmorStand-arm-status.patch index 8fae86dd..dc976907 100644 --- a/patches/server/0016-Stick-can-change-ArmorStand-arm-status.patch +++ b/patches/server/0016-Stick-can-change-ArmorStand-arm-status.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Stick can change ArmorStand arm status diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index 9b19cca3b8231b8fbda674f080922673503b1260..e3a32c8b764b4dec59c70283efc6611f469abe21 100644 +index 1c7702a5c888846f93f8f80d3b854a26c11499be..6609f4309c2d6fac14b56dd75963d868a464c44c 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -386,6 +386,12 @@ public class ArmorStand extends LivingEntity { diff --git a/patches/server/0020-Dont-send-useless-entity-packets.patch b/patches/server/0020-Dont-send-useless-entity-packets.patch index ecfd592c..cf977e43 100644 --- a/patches/server/0020-Dont-send-useless-entity-packets.patch +++ b/patches/server/0020-Dont-send-useless-entity-packets.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Dont send useless entity packets This patch is Powered by Purpur(https://github.com/PurpurMC/Purpur) diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index 892a334d1b1c0784ed6838d1aa066403998b9a9f..c5bec163e5b9a389e278d7074faa006a5eeb8149 100644 +index 35674f92a67f93382103c2766df4b678ba5c862f..b0517b9483a8cfd74997f89efdc0d8559b80ae4a 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -191,6 +191,7 @@ public class ServerEntity { diff --git a/patches/server/0024-Optimize-suffocation.patch b/patches/server/0024-Optimize-suffocation.patch index 6d929766..fa83fb7d 100644 --- a/patches/server/0024-Optimize-suffocation.patch +++ b/patches/server/0024-Optimize-suffocation.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize suffocation This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 293abc70b7a447a35835192a1f4333bbac8e88fc..79ac2dc637450ae960013fe6e79e792deaf5a5ab 100644 +index 79f56995e30dd0091a514d3f90603a83de0e754f..cbf0b393a996487cedb8eab5610647e795138f21 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -413,7 +413,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0037-Cache-climbing-check-for-activation.patch b/patches/server/0037-Cache-climbing-check-for-activation.patch index 3e9e6dae..30f58a88 100644 --- a/patches/server/0037-Cache-climbing-check-for-activation.patch +++ b/patches/server/0037-Cache-climbing-check-for-activation.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Cache climbing check for activation This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 79ac2dc637450ae960013fe6e79e792deaf5a5ab..61e110f230072072c8070bb3f30cc5a6313e75f3 100644 +index cbf0b393a996487cedb8eab5610647e795138f21..532c51848fcd65d5f26c51dddd61875e35558b80 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -2007,6 +2007,22 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0052-Return-nether-portal-fix.patch b/patches/server/0052-Return-nether-portal-fix.patch index 7e2b3ba7..24a699df 100644 --- a/patches/server/0052-Return-nether-portal-fix.patch +++ b/patches/server/0052-Return-nether-portal-fix.patch @@ -121,7 +121,7 @@ index 7f835ccc97daa0d5ebfebc0a5781233ac389a7ef..9cf607051794f673102dbb4dc887aafa // Save player file again if they were disconnected diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 61e110f230072072c8070bb3f30cc5a6313e75f3..37a9ed678f674fe7026fc59ff438eb3203f8a792 100644 +index 532c51848fcd65d5f26c51dddd61875e35558b80..257ad724f02a2b5e6ec84cde6339f18fb95d7a6d 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -241,7 +241,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0092-Reduce-array-allocations.patch b/patches/server/0092-Reduce-array-allocations.patch index b1adea9e..8b251837 100644 --- a/patches/server/0092-Reduce-array-allocations.patch +++ b/patches/server/0092-Reduce-array-allocations.patch @@ -214,7 +214,7 @@ index f265b3b3736de5ff3bc1b52146d11f92033730a5..50c73aaf95df8cb993994c59d1d4ecdd public class Connection extends SimpleChannelInboundHandler> { diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java -index c5bec163e5b9a389e278d7074faa006a5eeb8149..c76a81dc13ba7b88450e62f679e0b7a68f3b42f5 100644 +index b0517b9483a8cfd74997f89efdc0d8559b80ae4a..e7cfc98aa6dc19c5adad4c797ae7292a339986a6 100644 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java @@ -348,7 +348,7 @@ public class ServerEntity { @@ -398,7 +398,7 @@ index 2e324276ea4cd9e528c6a3f9a9ba394b378fe075..8d949983a30f27a60982f6b406151408 private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, String name) { this.type = type; diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 37a9ed678f674fe7026fc59ff438eb3203f8a792..d82e629fa347331b360d6f5ea1bd2d49edf5f677 100644 +index 257ad724f02a2b5e6ec84cde6339f18fb95d7a6d..61379db810c84a6044dee6d1a0457442d41cb407 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3141,7 +3141,7 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0098-Check-frozen-ticks-before-landing-block.patch b/patches/server/0098-Check-frozen-ticks-before-landing-block.patch index 2f1bffe2..9132a0eb 100644 --- a/patches/server/0098-Check-frozen-ticks-before-landing-block.patch +++ b/patches/server/0098-Check-frozen-ticks-before-landing-block.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Check frozen ticks before landing block This patch is Powered by Gale(https://github.com/GaleMC/Gale) diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index d82e629fa347331b360d6f5ea1bd2d49edf5f677..c8e1f4593016db76b95c14d18a90b3a5ca541662 100644 +index 61379db810c84a6044dee6d1a0457442d41cb407..8e9af399588698b05018cc63b5c36841a0bc02ed 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -582,11 +582,11 @@ public abstract class LivingEntity extends Entity implements Attackable { diff --git a/patches/server/0125-Armor-stand-cant-kill-by-mob-projectile.patch b/patches/server/0125-Armor-stand-cant-kill-by-mob-projectile.patch index 3a66b71d..510e9a52 100644 --- a/patches/server/0125-Armor-stand-cant-kill-by-mob-projectile.patch +++ b/patches/server/0125-Armor-stand-cant-kill-by-mob-projectile.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Armor stand cant kill by mob projectile diff --git a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java -index e3a32c8b764b4dec59c70283efc6611f469abe21..cddcd4b8124cc24de79d728dbd18f964e6752291 100644 +index 6609f4309c2d6fac14b56dd75963d868a464c44c..60859ca12d6df9770b3c0cb7feffbbb471b8b233 100644 --- a/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java +++ b/src/main/java/net/minecraft/world/entity/decoration/ArmorStand.java @@ -552,7 +552,7 @@ public class ArmorStand extends LivingEntity {