1 files changed, 0 insertions, 44 deletions
diff --git a/patches/server/0860-Fix-beehives-generating-from-using-bonemeal.patch b/patches/server/0860-Fix-beehives-generating-from-using-bonemeal.patch
deleted file mode 100644
index 51f5e5014e..0000000000
--- a/patches/server/0860-Fix-beehives-generating-from-using-bonemeal.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jake Potrebic <[email protected]>
-Date: Sun, 26 Mar 2023 18:07:56 -0700
-Subject: [PATCH] Fix beehives generating from using bonemeal
-
-
-diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 23fec59b51c99c1f0ac19ffd6c84ffa8fc3caaac..0e9d515381a673e683b63a12c1a9e79a5eedd80b 100644
---- a/src/main/java/net/minecraft/world/item/ItemStack.java
-+++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -422,6 +422,7 @@ public final class ItemStack {
-                     }
-                     for (CraftBlockState blockstate : blocks) {
-                         world.setBlock(blockstate.getPosition(),blockstate.getHandle(), blockstate.getFlag()); // SPIGOT-7248 - manual update to avoid physics where appropriate
-+                        if (blockstate instanceof org.bukkit.craftbukkit.block.CapturedBlockState capturedBlockState) capturedBlockState.checkTreeBlockHack(); // Paper - Fix beehives generating from using bonemeal
-                     }
-                     entityhuman.awardStat(Stats.ITEM_USED.get(item)); // SPIGOT-7236 - award stat
-                 }
-diff --git a/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java
-index 2aab5ba9e90f09e6d679ee0d0d5d5e52c44b677f..c17c8b2bff32bfd101675d73f8ab81b35a9e1c15 100644
---- a/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java
-+++ b/src/main/java/org/bukkit/craftbukkit/block/CapturedBlockState.java
-@@ -31,6 +31,12 @@ public final class CapturedBlockState extends CraftBlockState {
-     public boolean update(boolean force, boolean applyPhysics) {
-         boolean result = super.update(force, applyPhysics);
- 
-+        // Paper start - Fix beehives generating from using bonemeal
-+        this.checkTreeBlockHack();
-+        return result;
-+    }
-+    public void checkTreeBlockHack() {
-+        // Paper end - Fix beehives generating from using bonemeal
-         // SPIGOT-5537: Horrible hack to manually add bees given World.captureTreeGeneration does not support tiles
-         if (this.treeBlock && this.getType() == Material.BEE_NEST) {
-             WorldGenLevel generatoraccessseed = this.world.getHandle();
-@@ -53,7 +59,7 @@ public final class CapturedBlockState extends CraftBlockState {
-             // End copied block
-         }
- 
--        return result;
-+        // Paper - Fix beehives generating from using bonemeal
-     }
- 
-     @Override