From 01ffc9d48d8d32acb6ec9f295c146536b70bdbab Mon Sep 17 00:00:00 2001
From: Xiao-MoMi <70987828+Xiao-MoMi@users.noreply.github.com>
Date: Sun, 7 May 2023 09:51:10 +0800
Subject: [PATCH] 3.1.1-hotfix

---
 build.gradle                                                | 2 +-
 src/main/java/net/momirealms/customcrops/CustomCrops.java   | 4 ++--
 .../customcrops/api/object/sprinkler/SprinklerManager.java  | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 90574cc..93a1c11 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ plugins {
 }
 
 group = 'net.momirealms'
-version = '3.1.1'
+version = '3.1.1-hotfix'
 
 repositories {
     mavenCentral()
diff --git a/src/main/java/net/momirealms/customcrops/CustomCrops.java b/src/main/java/net/momirealms/customcrops/CustomCrops.java
index b3917f5..31573fe 100644
--- a/src/main/java/net/momirealms/customcrops/CustomCrops.java
+++ b/src/main/java/net/momirealms/customcrops/CustomCrops.java
@@ -193,11 +193,11 @@ public final class CustomCrops extends JavaPlugin {
 
     private boolean loadPlatform() {
         PluginManager pluginManager = Bukkit.getPluginManager();
-        if (pluginManager.isPluginEnabled("ItemsAdder")) {
+        if (pluginManager.getPlugin("ItemsAdder") != null) {
             this.platform = Platform.ItemsAdder;
             this.platformInterface = new ItemsAdderPluginImpl();
         }
-        else if (pluginManager.isPluginEnabled("Oraxen")) {
+        else if (pluginManager.getPlugin("Oraxen") != null) {
             this.platform = Platform.Oraxen;
             this.platformInterface = new OraxenPluginImpl();
         }
diff --git a/src/main/java/net/momirealms/customcrops/api/object/sprinkler/SprinklerManager.java b/src/main/java/net/momirealms/customcrops/api/object/sprinkler/SprinklerManager.java
index a18d579..7840a9a 100644
--- a/src/main/java/net/momirealms/customcrops/api/object/sprinkler/SprinklerManager.java
+++ b/src/main/java/net/momirealms/customcrops/api/object/sprinkler/SprinklerManager.java
@@ -157,16 +157,18 @@ public class SprinklerManager extends Function implements Listener {
     public void onItemSpawn(ItemSpawnEvent event) {
         if (event.isCancelled()) return;
         Item item = event.getEntity();
-        String id = plugin.getPlatformInterface().getItemStackID(item.getItemStack());
+        ItemStack origin = item.getItemStack();
+        String id = plugin.getPlatformInterface().getItemStackID(origin);
         String key = itemToKey.get(id);
         if (key == null) return;
         String twoD = sprinklerConfigMap.get(key).getTwoD();
-        if (twoD == null) return;
+        if (twoD == null || id.equals(twoD)) return;
         ItemStack itemStack = plugin.getPlatformInterface().getItemStack(twoD);
         if (itemStack == null) {
             AdventureUtils.consoleMessage("<red>[CustomCrops] 2D sprinkler " + twoD + " doesn't exist");
             return;
         }
+        itemStack.setAmount(origin.getAmount());
         item.setItemStack(itemStack);
     }
 }
\ No newline at end of file