From bce94b45583ebc54679ad8da1afcc2d4ab679029 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Thu, 5 Sep 2024 23:42:40 +0800 Subject: [PATCH] trigger death actions --- .../net/momirealms/customcrops/api/core/block/CropBlock.java | 1 + .../customcrops/api/requirement/RequirementManager.java | 1 + 2 files changed, 2 insertions(+) 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 97a060f..ca8b120 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 @@ -317,6 +317,7 @@ public class CropBlock extends AbstractCustomCropsBlock { Optional.ofNullable(deathCondition.deathStage()).ifPresent(it -> { BukkitCustomCropsPlugin.getInstance().getItemManager().place(bukkitLocation, deathCondition.existenceForm(), it, rotation); }); + ActionManager.trigger(context, config.deathActions()); }, deathCondition.deathDelay(), bukkitLocation); return; } diff --git a/api/src/main/java/net/momirealms/customcrops/api/requirement/RequirementManager.java b/api/src/main/java/net/momirealms/customcrops/api/requirement/RequirementManager.java index 9bd8e43..086c72f 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/requirement/RequirementManager.java +++ b/api/src/main/java/net/momirealms/customcrops/api/requirement/RequirementManager.java @@ -107,6 +107,7 @@ public interface RequirementManager extends Reloadable { static boolean isSatisfied(Context context, @Nullable Requirement[] requirements) { if (requirements == null) return true; for (Requirement requirement : requirements) { + if (requirement == null) continue; if (!requirement.isSatisfied(context)) { return false; }