From c96690dfaae4a92762092688d980d3e40baa4b4e Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Wed, 4 Dec 2024 16:34:04 +0800
Subject: [PATCH] Fixed grow actions

---
 .../customcrops/api/core/block/CropBlock.java          | 10 +++++++++-
 .../bukkit/BukkitCustomCropsPluginImpl.java            |  4 +++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/api/src/main/java/net/momirealms/customcrops/api/core/block/CropBlock.java b/api/src/main/java/net/momirealms/customcrops/api/core/block/CropBlock.java
index 52d943e..becdfdf 100644
--- a/api/src/main/java/net/momirealms/customcrops/api/core/block/CropBlock.java
+++ b/api/src/main/java/net/momirealms/customcrops/api/core/block/CropBlock.java
@@ -400,7 +400,15 @@ public class CropBlock extends AbstractCustomCropsBlock {
             CropStageConfig nextStage = config.stageWithModelByPoint(afterPoints);
 
             plugin.getScheduler().sync().run(() -> {
-                if (currentStage == nextStage) return;
+                if (currentStage == nextStage) {
+                    for (int i = previousPoint + 1; i <= afterPoints; i++) {
+                        CropStageConfig stage = config.stageByPoint(i);
+                        if (stage != null) {
+                            ActionManager.trigger(context, stage.growActions());
+                        }
+                    }
+                    return;
+                }
                 FurnitureRotation rotation = plugin.getItemManager().remove(bukkitLocation, ExistenceForm.ANY);
                 if (rotation == FurnitureRotation.NONE && config.rotation()) {
                     rotation = FurnitureRotation.random();
diff --git a/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java b/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java
index 41034e2..510f187 100644
--- a/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java
+++ b/plugin/src/main/java/net/momirealms/customcrops/bukkit/BukkitCustomCropsPluginImpl.java
@@ -208,7 +208,9 @@ public class BukkitCustomCropsPluginImpl extends BukkitCustomCropsPlugin {
         this.hologramManager.disable();
         this.integrationManager.disable();
         this.coolDownManager.disable();
-        this.commandManager.unregisterFeatures();
+        if (!Bukkit.getServer().isStopping()) {
+            this.commandManager.unregisterFeatures();
+        }
     }
 
     @Override