From eff43b7d6ff857ab6750cb35ebd9671f076019d4 Mon Sep 17 00:00:00 2001
From: Alisa Gusmeroli <96133902+guss-alberto@users.noreply.github.com>
Date: Thu, 23 Apr 2026 00:15:51 +0200
Subject: [PATCH] fix waterlogged bucket incorrect logging (#860)

---
 .../player/PlayerBucketEmptyListener.java        | 16 +---------------
 .../player/PlayerBucketFillListener.java         |  2 +-
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/main/java/net/coreprotect/listener/player/PlayerBucketEmptyListener.java b/src/main/java/net/coreprotect/listener/player/PlayerBucketEmptyListener.java
index f309090b..663df275 100644
--- a/src/main/java/net/coreprotect/listener/player/PlayerBucketEmptyListener.java
+++ b/src/main/java/net/coreprotect/listener/player/PlayerBucketEmptyListener.java
@@ -32,27 +32,13 @@ public final class PlayerBucketEmptyListener extends Queue implements Listener {
         }
 
         if (!event.isCancelled() && Config.getConfig(world).BUCKETS && inspect == 0) {
-            Block block = event.getBlockClicked();
+            Block block = event.getBlock();
             BlockData blockData = block.getBlockData();
             Material type = Material.WATER;
             if (event.getBucket().equals(Material.LAVA_BUCKET)) {
                 type = Material.LAVA;
             }
 
-            boolean getRelative = true;
-            if (blockData instanceof Waterlogged) {
-                if (type.equals(Material.WATER)) {
-                    boolean isWaterlogged = ((Waterlogged) blockData).isWaterlogged();
-                    if (!isWaterlogged) {
-                        getRelative = false;
-                    }
-                }
-            }
-            if (getRelative) {
-                block = block.getRelative(event.getBlockFace());
-                blockData = block.getBlockData();
-            }
-
             BlockState blockState = block.getState();
             int worldId = WorldUtils.getWorldId(block.getWorld().getName());
             int unixTimestamp = (int) (System.currentTimeMillis() / 1000L);
diff --git a/src/main/java/net/coreprotect/listener/player/PlayerBucketFillListener.java b/src/main/java/net/coreprotect/listener/player/PlayerBucketFillListener.java
index efe2548f..0be6517a 100644
--- a/src/main/java/net/coreprotect/listener/player/PlayerBucketFillListener.java
+++ b/src/main/java/net/coreprotect/listener/player/PlayerBucketFillListener.java
@@ -19,7 +19,7 @@ public final class PlayerBucketFillListener extends Queue implements Listener {
     @EventHandler(priority = EventPriority.HIGHEST)
     protected void onPlayerBucketFill(PlayerBucketFillEvent event) {
         String player = event.getPlayer().getName();
-        Block block = event.getBlockClicked();
+        Block block = event.getBlock();
         World world = block.getWorld();
         Material type = block.getType();