aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch
diff options
context:
space:
mode:
authorLulu13022002 <[email protected]>2024-04-06 23:51:47 +0200
committerGitHub <[email protected]>2024-04-06 14:51:47 -0700
commitacf838f5354292eeb2888ae763c9125f0c270409 (patch)
tree27cf33fdb309236f3c2e1ca537f39906fca42dae /patches/server/0707-Add-missing-block-data-mins-and-maxes.patch
parent182e79bce1260a11558232e626867b3a3b319155 (diff)
downloadPaper-acf838f5354292eeb2888ae763c9125f0c270409.tar.gz
Paper-acf838f5354292eeb2888ae763c9125f0c270409.zip
Backport some stuff from the generators branch (#10365)
Diffstat (limited to 'patches/server/0707-Add-missing-block-data-mins-and-maxes.patch')
-rw-r--r--patches/server/0707-Add-missing-block-data-mins-and-maxes.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch b/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch
index defc7411be..fe8170196d 100644
--- a/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch
+++ b/patches/server/0707-Add-missing-block-data-mins-and-maxes.patch
@@ -150,3 +150,21 @@ index 7a1f2fd2f7f8f1b46352fe2c4d0cdf23a88020fd..8b621aaeadcf2cc6e2ccdbab92f4ae2b
+ }
+ // 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 78b220a6f460cd91ad1574c0d32f3e4288eaf431..0f7df1b4c58ba731832958043ba345ec77737e54 100644
+--- a/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPinkPetals.java
++++ b/src/main/java/org/bukkit/craftbukkit/block/impl/CraftPinkPetals.java
+@@ -27,6 +27,13 @@ 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);