From 224d9b52de1534ce501c7341dd7f5c57dc1d5399 Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Wed, 5 Feb 2025 20:59:06 +0800 Subject: [PATCH] fix drop naturally --- .../customcrops/api/action/builtin/ActionDropItem.java | 7 ++++++- .../customcrops/api/action/builtin/ActionQualityCrops.java | 7 ++++++- .../customcrops/common/helper/VersionHelper.java | 4 ++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionDropItem.java b/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionDropItem.java index 1a780df..14f7233 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionDropItem.java +++ b/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionDropItem.java @@ -33,6 +33,7 @@ import net.momirealms.customcrops.api.misc.value.MathValue; import net.momirealms.customcrops.api.util.EventUtils; import net.momirealms.customcrops.api.util.LocationUtils; import net.momirealms.customcrops.api.util.PlayerUtils; +import net.momirealms.customcrops.common.helper.VersionHelper; import net.momirealms.customcrops.common.util.RandomUtils; import org.bukkit.Location; import org.bukkit.Material; @@ -88,7 +89,11 @@ public class ActionDropItem extends AbstractBuiltInAction { if (toInv && player != null) { PlayerUtils.giveItem(player, itemToDrop, itemToDrop.getAmount()); } else { - location.getWorld().dropItemNaturally(LocationUtils.toBlockCenterLocation(location), itemToDrop); + if (VersionHelper.isVersionNewerThan1_21_2()) { + location.getWorld().dropItemNaturally(LocationUtils.toBlockCenterLocation(location), itemToDrop); + } else { + location.getWorld().dropItemNaturally(LocationUtils.toBlockLocation(location), itemToDrop); + } } } }, location); diff --git a/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionQualityCrops.java b/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionQualityCrops.java index c5b9ff1..562607b 100644 --- a/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionQualityCrops.java +++ b/api/src/main/java/net/momirealms/customcrops/api/action/builtin/ActionQualityCrops.java @@ -34,6 +34,7 @@ import net.momirealms.customcrops.api.misc.value.MathValue; import net.momirealms.customcrops.api.util.EventUtils; import net.momirealms.customcrops.api.util.LocationUtils; import net.momirealms.customcrops.api.util.PlayerUtils; +import net.momirealms.customcrops.common.helper.VersionHelper; import net.momirealms.customcrops.common.util.RandomUtils; import org.bukkit.Location; import org.bukkit.Material; @@ -95,7 +96,11 @@ public class ActionQualityCrops extends AbstractBuiltInAction { if (toInv && player != null) { PlayerUtils.giveItem(player, itemStack, itemStack.getAmount()); } else { - location.getWorld().dropItemNaturally(LocationUtils.toBlockCenterLocation(location), itemStack); + if (VersionHelper.isVersionNewerThan1_21_2()) { + location.getWorld().dropItemNaturally(LocationUtils.toBlockCenterLocation(location), itemStack); + } else { + location.getWorld().dropItemNaturally(LocationUtils.toBlockLocation(location), itemStack); + } } } }, location); diff --git a/api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java b/api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java index 72ffb41..ed6e23e 100644 --- a/api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java +++ b/api/src/main/java/net/momirealms/customcrops/common/helper/VersionHelper.java @@ -106,6 +106,10 @@ public class VersionHelper { return version >= 21.39; } + public static boolean isVersionNewerThan1_21_2() { + return version >= 19; + } + public static boolean isFolia() { return folia; }