From 2de8d61b3ddb224aca2f39e8603ff403618bffb1 Mon Sep 17 00:00:00 2001
From: violetc <58360096+s-yh-china@users.noreply.github.com>
Date: Wed, 19 Feb 2025 16:52:20 +0800
Subject: [PATCH] Update Paper

---
 gradle.properties                                      |  2 +-
 .../features/0013-Configurable-MC-59471.patch          |  6 +++---
 .../paper-patches/features/0014-Bytebuf-API.patch      | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 25205f01..2a4e7308 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=8eb8e44ac32a99f53da7af50e800ac8831030580
+paperRef=edda0db18b0c9b0304e06fb167b218d1e1cf8d55
 preVersion=true
 org.gradle.jvmargs=-Xmx2G
 org.gradle.caching=true
diff --git a/leaves-server/minecraft-patches/features/0013-Configurable-MC-59471.patch b/leaves-server/minecraft-patches/features/0013-Configurable-MC-59471.patch
index c5af57d1..45909399 100644
--- a/leaves-server/minecraft-patches/features/0013-Configurable-MC-59471.patch
+++ b/leaves-server/minecraft-patches/features/0013-Configurable-MC-59471.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable MC-59471
 
 
 diff --git a/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java
-index 30b97cdcd495490ef65c2ab9dfc39a39c93002ca..15454e9b3289a722c8d7e33ce421a544d03966fa 100644
+index 9aace993c6c18f1a50610e4766225485984b8167..dee8bd2a22be8639f8faec428a5ca3a1ecc1d356 100644
 --- a/net/minecraft/world/level/block/TripWireHookBlock.java
 +++ b/net/minecraft/world/level/block/TripWireHookBlock.java
 @@ -201,7 +201,6 @@ public class TripWireHookBlock extends Block {
@@ -22,7 +22,7 @@ index 30b97cdcd495490ef65c2ab9dfc39a39c93002ca..15454e9b3289a722c8d7e33ce421a544
                      if (blockState2 != null) {
 -                        BlockState blockState3 = level.getBlockState(blockPos1);
 -                        if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
--                            level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3);
+-                            if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates || !blockState3.is(Blocks.TRIPWIRE)) level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3); // Paper - prevent tripwire from updating
 +                        // Leaves start - MC-59471
 +                        if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.stringTripwireHookDuplicate) {
 +                            level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, flag2), 3);
@@ -30,7 +30,7 @@ index 30b97cdcd495490ef65c2ab9dfc39a39c93002ca..15454e9b3289a722c8d7e33ce421a544
 +                        } else {
 +                            BlockState blockState3 = level.getBlockState(blockPos1);
 +                            if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
-+                                level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3);
++                                if (!io.papermc.paper.configuration.GlobalConfiguration.get().blockUpdates.disableTripwireUpdates || !blockState3.is(Blocks.TRIPWIRE)) level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3); // Paper - prevent tripwire from updating
 +                            }
                          }
 +                        // Leaves end - MC-59471
diff --git a/leaves-server/paper-patches/features/0014-Bytebuf-API.patch b/leaves-server/paper-patches/features/0014-Bytebuf-API.patch
index 7e8a2a9e..9c7ca323 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 99258ad5c0af91f24525bac9442cead9541c2e83..5420aa63b7888ba7ba4ed05aff43e77540c97f04 100644
+index 2669b774ca837cb7f1a9e2ea924641f35841bf97..488e78a4408585bd4a309cbf5eead775f2223382 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 {
@@ -33,12 +33,12 @@ index 99258ad5c0af91f24525bac9442cead9541c2e83..5420aa63b7888ba7ba4ed05aff43e775
 +    // Leaves end - Bytebuf API
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 121560c873200390e261aef0f639f78a7a668883..9fb92d7103f004cca7639ccac1eeda9d490262f4 100644
+index f746ec4e38a6191c68c35a98fb90dcadb349d837..8acec30c9c8b098358001e6a51444ef0e799f608 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -3583,4 +3583,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
-         handle.containerMenu.broadcastChanges();
-         return new PaperPlayerGiveResult(leftovers.build(), drops.build());
+@@ -3599,4 +3599,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+ 
+         return forwardMovement == backwardMovement ? 0 : forwardMovement ? 1 : -1;
      }
 +
 +    // Leaves start - Bytebuf API