Przeglądaj źródła

Replant only the fully grown plants.

t00thpick1 6 lat temu
rodzic
commit
1fcecbd3e7

+ 3 - 3
src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java

@@ -134,9 +134,6 @@ public class HerbalismManager extends SkillManager {
             }
         }
         else {
-            if (!BlockUtils.isHarvestable(blockState))
-                return;
-
             xp = ExperienceConfig.getInstance().getXp(skill, blockState.getType());
 
             if (Config.getInstance().getDoubleDropsEnabled(skill, material) && Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HERBALISM_DOUBLE_DROPS)) {
@@ -260,6 +257,9 @@ public class HerbalismManager extends SkillManager {
      * @param greenTerra boolean to determine if greenTerra is active or not
      */
     private void processGreenThumbPlants(BlockState blockState, boolean greenTerra) {
+        if (!BlockUtils.isFullyGrown(blockState))
+            return;
+
         Player player = getPlayer();
         PlayerInventory playerInventory = player.getInventory();
         Material seed = null;

+ 1 - 3
src/main/java/com/gmail/nossr50/util/BlockUtils.java

@@ -355,15 +355,13 @@ public final class BlockUtils {
         return transparentBlocks;
     }
 
-    public static boolean isHarvestable(BlockState blockState) {
+    public static boolean isFullyGrown(BlockState blockState) {
         BlockData data = blockState.getBlockData();
         if (data.getMaterial() == Material.CACTUS || data.getMaterial() == Material.SUGAR_CANE)
             return true;
         if (data instanceof Ageable)
         {
             Ageable ageable = (Ageable) data;
-            mcMMO.p.debug(ageable.getAge() + "/" + ageable.getMaximumAge());
-            System.out.println(ageable.getAge() + "/" + ageable.getMaximumAge());
             return ageable.getAge() == ageable.getMaximumAge();
         }
         return true;