From 189efa37c1f555bbc4f0a3a98eed938a9bbe9b94 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <70987828+Xiao-MoMi@users.noreply.github.com> Date: Sat, 24 Aug 2024 16:42:53 +0800 Subject: [PATCH] 3.5.10 --- .../api/mechanic/item/custom/AbstractCustomListener.java | 9 ++++++++- build.gradle.kts | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/net/momirealms/customcrops/api/mechanic/item/custom/AbstractCustomListener.java b/api/src/main/java/net/momirealms/customcrops/api/mechanic/item/custom/AbstractCustomListener.java index b60ab43..5c4bbe6 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/mechanic/item/custom/AbstractCustomListener.java +++ b/api/src/main/java/net/momirealms/customcrops/api/mechanic/item/custom/AbstractCustomListener.java @@ -28,6 +28,8 @@ import net.momirealms.customcrops.api.mechanic.requirement.State; import net.momirealms.customcrops.api.mechanic.world.CustomCropsBlock; import net.momirealms.customcrops.api.mechanic.world.SimpleLocation; import net.momirealms.customcrops.api.mechanic.world.level.WorldCrop; +import net.momirealms.customcrops.api.mechanic.world.level.WorldGlass; +import net.momirealms.customcrops.api.mechanic.world.level.WorldPot; import net.momirealms.customcrops.api.util.EventUtils; import org.bukkit.Location; import org.bukkit.Material; @@ -164,7 +166,12 @@ public abstract class AbstractCustomListener implements Listener { final Location location = block.getLocation(); Optional customCropsBlock = CustomCropsPlugin.get().getWorldManager().getBlockAt(SimpleLocation.of(location)); if (customCropsBlock.isPresent()) { - CustomCropsPlugin.get().getWorldManager().removeAnythingAt(SimpleLocation.of(location)); + if (customCropsBlock.get() instanceof WorldPot || customCropsBlock.get() instanceof WorldGlass) { + CustomCropsPlugin.get().getWorldManager().removeAnythingAt(SimpleLocation.of(location)); + } else { + event.setCancelled(true); + return; + } } this.onPlaceBlock( event.getPlayer(), diff --git a/build.gradle.kts b/build.gradle.kts index 683b23a..2edf598 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,7 +8,7 @@ plugins { allprojects { project.group = "net.momirealms" - project.version = "3.5.9" + project.version = "3.5.10" apply() apply(plugin = "java")