From e399c3392254798d6f438d6cbec5530b3716686e Mon Sep 17 00:00:00 2001
From: XiaoMoMi <70987828+Xiao-MoMi@users.noreply.github.com>
Date: Thu, 5 Sep 2024 17:02:54 +0800
Subject: [PATCH] Fix getting water

---
 .../customcrops/api/core/item/WateringCanItem.java          | 6 ++++++
 gradle.properties                                           | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/api/src/main/java/net/momirealms/customcrops/api/core/item/WateringCanItem.java b/api/src/main/java/net/momirealms/customcrops/api/core/item/WateringCanItem.java
index e4a8bbc..c3b232f 100644
--- a/api/src/main/java/net/momirealms/customcrops/api/core/item/WateringCanItem.java
+++ b/api/src/main/java/net/momirealms/customcrops/api/core/item/WateringCanItem.java
@@ -139,6 +139,9 @@ public class WateringCanItem extends AbstractCustomCropsItem {
         int water = getCurrentWater(itemInHand);
 
         String blockID = BukkitCustomCropsPlugin.getInstance().getItemManager().blockID(targetBlock);
+        if (targetBlock.getType() == Material.WATER) {
+            blockID = "WATER";
+        }
         if (targetBlock.getBlockData() instanceof Waterlogged waterlogged && waterlogged.isWaterlogged()) {
             blockID = "WATER";
         }
@@ -308,6 +311,9 @@ public class WateringCanItem extends AbstractCustomCropsItem {
         // for old config compatibility
         context.arg(ContextKeys.LOCATION, new Location(player.getWorld(), vector.getX() - 0.5,vector.getY() - 1, vector.getZ() - 0.5));
         String blockID = BukkitCustomCropsPlugin.getInstance().getItemManager().blockID(targetBlock);
+        if (targetBlock.getType() == Material.WATER) {
+            blockID = "WATER";
+        }
         if (targetBlock.getBlockData() instanceof Waterlogged waterlogged && waterlogged.isWaterlogged()) {
             blockID = "WATER";
         }
diff --git a/gradle.properties b/gradle.properties
index 17c3c24..e7ccfa3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 # Project settings
 # Rule: [major update].[feature update].[bug fix]
-project_version=3.6.0
+project_version=3.6.1
 config_version=38
 project_group=net.momirealms