From 9633ac3ca3b23470301b212c827ee1551b878121 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Thu, 15 Oct 2020 12:38:46 +0100 Subject: [PATCH] Replenish can now replant not-grown crops --- .../ecoenchants/normal/GreenThumb.java | 1 + .../ecoenchants/normal/Replenish.java | 15 ++++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java index 706fac8e..b3b406ef 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/GreenThumb.java @@ -36,6 +36,7 @@ public final class GreenThumb extends EcoEnchant { if (!EnchantChecks.mainhand(player, this)) return; if(!AntigriefManager.canBreakBlock(player, event.getClickedBlock())) return; + if(!AntigriefManager.canPlaceBlock(player, event.getClickedBlock())) return; if(this.getConfig().getBool(EcoEnchants.CONFIG_LOCATION + "damage")) ItemDurability.damageItem(player, player.getInventory().getItemInMainHand(), 1, player.getInventory().getHeldItemSlot()); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Replenish.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Replenish.java index ea9d48ed..c6504493 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Replenish.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Replenish.java @@ -26,7 +26,20 @@ public final class Replenish extends EcoEnchant { if(!(block.getBlockData() instanceof Ageable)) return; Ageable data = (Ageable) block.getBlockData(); - if(data.getAge() != data.getMaximumAge()) return; + if(data.getAge() != data.getMaximumAge()) { + event.setDropItems(false); + event.setExpToDrop(0); + + data.setAge(0); + + new BukkitRunnable() { + @Override + public void run() { + block.setType(type); + block.setBlockData(data); + } + }.runTaskLater(EcoEnchantsPlugin.getInstance(), 1); + } data.setAge(0);