From 448780d9822be8e8db807788896680f606fb1927 Mon Sep 17 00:00:00 2001
From: XiaoMoMi <littlemomi@qq.com>
Date: Fri, 29 Nov 2024 00:44:26 +0800
Subject: [PATCH] remove break check

---
 .../customcrops/api/core/block/CropBlock.java  | 18 ++++++++++--------
 gradle.properties                              |  2 +-
 plugin/build.gradle.kts                        |  3 ++-
 3 files changed, 13 insertions(+), 10 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 2d4b48c..52d943e 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
@@ -114,14 +114,16 @@ public class CropBlock extends AbstractCustomCropsBlock {
 
         context.updateLocation(location);
 
-        // check requirements
-        if (!RequirementManager.isSatisfied(context, cropConfig.breakRequirements())) {
-            event.setCancelled(true);
-            return;
-        }
-        if (!RequirementManager.isSatisfied(context, stageConfig.breakRequirements())) {
-            event.setCancelled(true);
-            return;
+        // check requirements only if it's triggered by direct events
+        if (event.reason() == BreakReason.BREAK) {
+            if (!RequirementManager.isSatisfied(context, cropConfig.breakRequirements())) {
+                event.setCancelled(true);
+                return;
+            }
+            if (!RequirementManager.isSatisfied(context, stageConfig.breakRequirements())) {
+                event.setCancelled(true);
+                return;
+            }
         }
 
         CropBreakEvent breakEvent = new CropBreakEvent(event.entityBreaker(), event.blockBreaker(), cropConfig, event.brokenID(), event.location(),
diff --git a/gradle.properties b/gradle.properties
index d203d04..99b0984 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -34,7 +34,7 @@ rtag_version=1.5.8
 exp4j_version=0.4.8
 placeholder_api_version=2.11.6
 anti_grief_version=0.13
-zstd_version=1.5.6-6
+zstd_version=1.5.6-8
 flow_nbt_version=2.0.2
 guava_version=33.3.1-jre
 vault_version=1.7
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
index 59f12d5..e004c06 100644
--- a/plugin/build.gradle.kts
+++ b/plugin/build.gradle.kts
@@ -35,7 +35,8 @@ dependencies {
     implementation("com.github.Xiao-MoMi:Sparrow-Heart:${rootProject.properties["sparrow_heart_version"]}")
     implementation("com.saicone.rtag:rtag:${rootProject.properties["rtag_version"]}")
     implementation("com.saicone.rtag:rtag-item:${rootProject.properties["rtag_version"]}")
-    implementation("com.flowpowered:flow-nbt:${rootProject.properties["flow_nbt_version"]}") // do not relocate for compatibility with SWM
+    // TODO use sparrow-nbt
+    implementation("com.flowpowered:flow-nbt:${rootProject.properties["flow_nbt_version"]}") // do not relocate (compatibility with AdvancedSlimePaper)
     compileOnly("org.incendo:cloud-core:${rootProject.properties["cloud_core_version"]}")
     compileOnly("org.incendo:cloud-minecraft-extras:${rootProject.properties["cloud_minecraft_extras_version"]}")
     compileOnly("org.incendo:cloud-paper:${rootProject.properties["cloud_paper_version"]}")