make cactus max grow height config consistent with flower chance

Author: Lulu13022002

paper-server/patches/sources/net/minecraft/world/level/block/CactusBlock.java.patch

@@ -1,6 +1,6 @@
 --- a/net/minecraft/world/level/block/CactusBlock.java
 +++ b/net/minecraft/world/level/block/CactusBlock.java
-@@ -58,7 +_,7 @@
+@@ -58,25 +_,29 @@
              int ageValue = state.getValue(AGE);
 
              while (level.getBlockState(pos.below(i)).is(this)) {
@@ -9,9 +9,10 @@
                      return;
                  }
              }
-@@ -66,17 +_,21 @@
+ 
              if (ageValue == 8 && this.canSurvive(this.defaultBlockState(), level, pos.above())) {
-                 double d = i >= 3 ? 0.25 : 0.1;
+-                double d = i >= 3 ? 0.25 : 0.1;
++                double d = i >= level.paperConfig().maxGrowthHeight.cactus ? 0.25 : 0.1; // Paper - Configurable cactus/bamboo/reed growth height
                  if (random.nextDouble() <= d) {
 -                    level.setBlockAndUpdate(blockPos, Blocks.CACTUS_FLOWER.defaultBlockState());
 -                }

paper-server/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java

@@ -52,6 +52,7 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.NaturalSpawner;
+import net.minecraft.world.level.block.BambooStalkBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
@@ -389,7 +390,7 @@ public class MaxGrowthHeight extends ConfigurationPart {
         public Bamboo bamboo;
 
         public class Bamboo extends ConfigurationPart {
-            public int max = 16;
+            public int max = BambooStalkBlock.MAX_HEIGHT;
             public int min = 11;
         }
     }