Backport some stuff from the generators branch (#10365)

2024-04-06 23:51:47 +02:00 · 2024-04-06 23:51:47 +02:00 · d06c0b4571
commit d06c0b4571
parent 613a19f70d
7 changed files with 74 additions and 24 deletions
--- a/patches/server/Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/Add-missing-block-data-mins-and-maxes.patch
@ -150,3 +150,21 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    }
 +    // Paper end
 }
+diff --git a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPinkPetals.java b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPinkPetals.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPinkPetals.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPinkPetals.java
+@@ -0,0 +0,0 @@ public final class CraftPinkPetals extends org.bukkit.craftbukkit.block.data.Cra
+         this.set(CraftPinkPetals.FLOWER_AMOUNT, flower_amount);
+     }
+ 
+    // Paper start
+    @Override
+    public int getMinimumFlowerAmount() {
+        return getMin(CraftPinkPetals.FLOWER_AMOUNT);
+    }
+    // Paper end
+
+     @Override
+     public int getMaximumFlowerAmount() {
+         return getMax(CraftPinkPetals.FLOWER_AMOUNT);