From be7bb9c0be0ce2176fc711b19fc0fd8e57d5ef5e Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Sat, 8 Mar 2025 21:16:06 +0800 Subject: [PATCH] Update Paper --- gradle.properties | 2 +- .../features/0062-Optimize-sun-burn-tick.patch | 6 +++--- .../0104-Can-disable-LivingEntity-aiStep-alive-check.patch | 4 ++-- .../paper-patches/features/0005-Leaves-Fakeplayer.patch | 4 ++-- .../paper-patches/features/0012-Replay-Mod-API.patch | 4 ++-- leaves-server/paper-patches/features/0014-Bytebuf-API.patch | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 6abd89f3..fea7b22f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=org.leavesmc.leaves version=1.21.4-R0.1-SNAPSHOT mcVersion=1.21.4 -paperRef=9421f223724576accdb94041ec3e4772d4acd670 +paperRef=ce3001621894ea775206abe455442d0aeeef3535 preVersion=true org.gradle.jvmargs=-Xmx2G org.gradle.caching=true diff --git a/leaves-server/minecraft-patches/features/0062-Optimize-sun-burn-tick.patch b/leaves-server/minecraft-patches/features/0062-Optimize-sun-burn-tick.patch index 21bbe99d..3f712273 100644 --- a/leaves-server/minecraft-patches/features/0062-Optimize-sun-burn-tick.patch +++ b/leaves-server/minecraft-patches/features/0062-Optimize-sun-burn-tick.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Optimize sun burn tick This patch is Powered by Gale(https://github.com/GaleMC/Gale) diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java -index fa03945c0f6c3fba7cd9bbfb93d90d0719825adb..8d96e314911d9985fad3d395f557aec3e04f7cff 100644 +index 7dc1aaaf590edcd1e7c6c6734c4baeecbfec93a7..3a2bf5f3db1130cae4c7d8dd43b5553d109982be 100644 --- a/net/minecraft/world/entity/Entity.java +++ b/net/minecraft/world/entity/Entity.java @@ -2040,10 +2040,22 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess @@ -36,10 +36,10 @@ index fa03945c0f6c3fba7cd9bbfb93d90d0719825adb..8d96e314911d9985fad3d395f557aec3 public void absMoveTo(double x, double y, double z, float yRot, float xRot) { this.absMoveTo(x, y, z); diff --git a/net/minecraft/world/entity/Mob.java b/net/minecraft/world/entity/Mob.java -index b694ea0a5fee852c31ff503a42e50a999c5a287b..6810037ab23e79986ef0f5d959bc317142df67cd 100644 +index 6a9a4ac52602d68f679672e16391304b8e6d8252..12c2b73ff94fb29a6d22917553a67b1cf03b5a68 100644 --- a/net/minecraft/world/entity/Mob.java +++ b/net/minecraft/world/entity/Mob.java -@@ -1627,20 +1627,40 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab +@@ -1629,20 +1629,40 @@ public abstract class Mob extends LivingEntity implements EquipmentUser, Leashab protected void playAttackSound() { } diff --git a/leaves-server/minecraft-patches/features/0104-Can-disable-LivingEntity-aiStep-alive-check.patch b/leaves-server/minecraft-patches/features/0104-Can-disable-LivingEntity-aiStep-alive-check.patch index b83a195f..0d181141 100644 --- a/leaves-server/minecraft-patches/features/0104-Can-disable-LivingEntity-aiStep-alive-check.patch +++ b/leaves-server/minecraft-patches/features/0104-Can-disable-LivingEntity-aiStep-alive-check.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Can disable LivingEntity aiStep alive check diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java -index 0cd9a4ff2c480774487bd82531996a35db81ae14..a007bfc5630739f4ea85d7e9ef0d67d2a027823e 100644 +index 07f9e7d657d8800fda6731ac2f15873d6481f3fb..b1b738bcd20cbc927bdbac6ab10e28f79fd8a23b 100644 --- a/net/minecraft/world/entity/LivingEntity.java +++ b/net/minecraft/world/entity/LivingEntity.java -@@ -3166,7 +3166,7 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3173,7 +3173,7 @@ public abstract class LivingEntity extends Entity implements Attackable { } } diff --git a/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch b/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch index 0469b48a..18ab8124 100644 --- a/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch +++ b/leaves-server/paper-patches/features/0005-Leaves-Fakeplayer.patch @@ -34,7 +34,7 @@ index adc6741e0e017660fbd39a62b69be1e67e0e143f..9bc40b07b8eebded4f748fd053b45571 if (nmsEntity.level() != this.getHandle().getLevel()) { nmsEntity = nmsEntity.teleport(new TeleportTransition(this.getHandle().getLevel(), nmsEntity, TeleportTransition.DO_NOTHING)); diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 5e3aa45b3b6d8ed6cc5f025fcea47638dbe591d8..f77549b7cfb432c3645638c7515b27a73a2e5a23 100644 +index f7814ab48e02c443a574106f4eafbfcf8cb528c9..174b45019c5e6089556df4ebf8aef0decf23b91d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -315,6 +315,7 @@ public final class CraftServer implements Server { @@ -62,7 +62,7 @@ index 5e3aa45b3b6d8ed6cc5f025fcea47638dbe591d8..f77549b7cfb432c3645638c7515b27a7 return false; } -@@ -3298,4 +3300,11 @@ public final class CraftServer implements Server { +@@ -3299,4 +3301,11 @@ public final class CraftServer implements Server { this.console.addPluginAllowingSleep(plugin.getName(), value); } // Paper end - API to check if the server is sleeping diff --git a/leaves-server/paper-patches/features/0012-Replay-Mod-API.patch b/leaves-server/paper-patches/features/0012-Replay-Mod-API.patch index f38ed1ef..c161ce0f 100644 --- a/leaves-server/paper-patches/features/0012-Replay-Mod-API.patch +++ b/leaves-server/paper-patches/features/0012-Replay-Mod-API.patch @@ -19,7 +19,7 @@ index a0a6cde96322df8e455b26b32b1c593f332d4db6..b5031ba5c48c7d007a7c05766a2beff4 } // Leaves end - skip bot diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index f77549b7cfb432c3645638c7515b27a73a2e5a23..c0da73c9e97f2351bfbe28f4beef1e3444315da7 100644 +index 174b45019c5e6089556df4ebf8aef0decf23b91d..9668eeb821075abee8da35d849090d4f5ba75cae 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -316,6 +316,7 @@ public final class CraftServer implements Server { @@ -39,7 +39,7 @@ index f77549b7cfb432c3645638c7515b27a73a2e5a23..c0da73c9e97f2351bfbe28f4beef1e34 @Override public CraftPlayer apply(ServerPlayer player) { return player.getBukkitEntity(); -@@ -3307,4 +3308,11 @@ public final class CraftServer implements Server { +@@ -3308,4 +3309,11 @@ public final class CraftServer implements Server { return botManager; } // Leaves end - Bot API diff --git a/leaves-server/paper-patches/features/0014-Bytebuf-API.patch b/leaves-server/paper-patches/features/0014-Bytebuf-API.patch index cf3f7b11..c240647d 100644 --- a/leaves-server/paper-patches/features/0014-Bytebuf-API.patch +++ b/leaves-server/paper-patches/features/0014-Bytebuf-API.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Bytebuf API diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index c0da73c9e97f2351bfbe28f4beef1e3444315da7..a48cb07ba4cbbf3a6aacb982ff6cc654c55d9a50 100644 +index 9668eeb821075abee8da35d849090d4f5ba75cae..d0639618ff9c179aaa8d591f7c1b9251f8a5a93d 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -317,6 +317,7 @@ public final class CraftServer implements Server { @@ -16,7 +16,7 @@ index c0da73c9e97f2351bfbe28f4beef1e3444315da7..a48cb07ba4cbbf3a6aacb982ff6cc654 // Paper start - Folia region threading API private final io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler regionizedScheduler = new io.papermc.paper.threadedregions.scheduler.FallbackRegionScheduler(); -@@ -3315,4 +3316,15 @@ public final class CraftServer implements Server { +@@ -3316,4 +3317,15 @@ public final class CraftServer implements Server { return photographerManager; } // Leaves end - replay mod api