From 48e94e8c8966c36322b5dd59344d5283bee3243e Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Sat, 7 Jun 2025 23:52:09 +0200
Subject: [PATCH] fix sponge absorb resetting block entity data of waterlogged
 blocks

alternative to https://github.com/PaperMC/Paper/commit/320f25cb04f183c18c16595100897622c88ce073, this commit has the side effect of
not including the waterlogged block into the block list for the later event. Generally this logic is fragile and should be handled by
the BlockStateListPopulator in the future.
---
 .../java/io/papermc/paper/datacomponent/item/Equippable.java | 2 +-
 .../net/minecraft/world/level/block/SpongeBlock.java.patch   | 2 +-
 test-plugin/build.gradle.kts                                 | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/paper-api/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java b/paper-api/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java
index dbb21d7baa..570ed9d28a 100644
--- a/paper-api/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java
+++ b/paper-api/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java
@@ -107,7 +107,7 @@ public interface Equippable extends BuildableDataComponent<Equippable, Equippabl
     /**
      * Checks if the item can be sheared off an entity.
      *
-     * @return true if can be sheared of an entity, false otherwise
+     * @return true if can be sheared off an entity, false otherwise
      */
     @Contract(pure = true)
     boolean canBeSheared();
diff --git a/paper-server/patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch b/paper-server/patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch
index ade9ebb7b1..015dae2402 100644
--- a/paper-server/patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/level/block/SpongeBlock.java.patch
@@ -71,7 +71,7 @@
 +                FluidState fluid = level.getFluidState(blockPos);
 +
 +                if (fluid.is(FluidTags.WATER)) {
-+                    if (state.getBlock() instanceof BucketPickup bucketPickup && !bucketPickup.pickupBlock(null, blockList, blockPos, state).isEmpty()) {
++                    if (state.getBlock() instanceof BucketPickup bucketPickup && !bucketPickup.pickupBlock(null, level, blockPos, state).isEmpty()) {
 +                        // NOP
 +                    } else if (state.getBlock() instanceof LiquidBlock) {
 +                        // NOP
diff --git a/test-plugin/build.gradle.kts b/test-plugin/build.gradle.kts
index 7813bc6289..af38ca2cf1 100644
--- a/test-plugin/build.gradle.kts
+++ b/test-plugin/build.gradle.kts
@@ -7,10 +7,7 @@ dependencies {
 tasks.processResources {
     var apiVersion = rootProject.providers.gradleProperty("mcVersion").get()
     // Bukkit api versioning does not support suffixed versions
-    val possibleSuffix = apiVersion.indexOf('-')
-    if (possibleSuffix != -1) {
-        apiVersion = apiVersion.substring(0, possibleSuffix);
-    }
+    apiVersion = apiVersion.substringBefore('-')
 
     val props = mapOf(
         "version" to project.version,