diff --git a/patches/server/0097-Allow-beehives-to-generate-with-saplings.patch b/patches/server/0097-Allow-beehives-to-generate-with-saplings.patch
index 62ca85cff..756b7178f 100644
--- a/patches/server/0097-Allow-beehives-to-generate-with-saplings.patch
+++ b/patches/server/0097-Allow-beehives-to-generate-with-saplings.patch
@@ -1,11 +1,10 @@
-From d9ba80236c9cb9d62dcb87a5c0b644cfa68cd9f0 Mon Sep 17 00:00:00 2001
+From 67f5e98a4b24b58ac41035495afc9301d1d5270e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 4 Jan 2020 11:41:38 -0600
 Subject: [PATCH] Allow beehives to generate with saplings
 
 ---
  .../server/BiomeDecoratorGroups.java          | 260 +++++++++---------
- .../WorldGenFeatureStateProviderWeighted.java |  12 +-
  .../server/WorldGenFeatureTreeBeehive.java    |   8 +-
  .../minecraft/server/WorldGenGroundBush.java  |  10 +-
  .../server/WorldGenTreeAbstract.java          |   6 +
@@ -14,7 +13,7 @@ Subject: [PATCH] Allow beehives to generate with saplings
  .../server/WorldGenTreeProviderOak.java       |  33 ++-
  .../net/minecraft/server/WorldGenerator.java  |   7 +-
  .../net/pl3x/purpur/PurpurWorldConfig.java    |   5 +
- 10 files changed, 221 insertions(+), 146 deletions(-)
+ 9 files changed, 212 insertions(+), 143 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BiomeDecoratorGroups.java b/src/main/java/net/minecraft/server/BiomeDecoratorGroups.java
 index 8aabc14a53..13246e6cd1 100644
@@ -497,29 +496,6 @@ index 8aabc14a53..13246e6cd1 100644
 +        biomebase.a(WorldGenStage.Decoration.SURFACE_STRUCTURES, WorldGenerator.END_CITY.b(WorldGenFeatureConfiguration.e).a(WorldGenDecorator.a.a(WorldGenFeatureDecoratorConfiguration.e))); // Purpur - decompile error
      }
  }
-diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
-index e2af6d43b2..c886a06a3d 100644
---- a/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
-+++ b/src/main/java/net/minecraft/server/WorldGenFeatureStateProviderWeighted.java
-@@ -37,9 +37,15 @@ public class WorldGenFeatureStateProviderWeighted extends WorldGenFeatureStatePr
-     public synchronized <T> T a(DynamicOps<T> dynamicops) { // Paper
-         Builder<T, T> builder = ImmutableMap.builder();
- 
--        builder.put(dynamicops.createString("type"), dynamicops.createString(IRegistry.t.getKey(this.a).toString())).put(dynamicops.createString("entries"), this.b.a(dynamicops, (iblockdata) -> {
--            return IBlockData.a(dynamicops, iblockdata);
--        }));
-+        builder.put(
-+                dynamicops.createString("type"),
-+                dynamicops.createString(IRegistry.t.getKey(this.a).toString())
-+        ).put(
-+                dynamicops.createString("entries"),
-+                this.b.a(dynamicops, (iblockdata) -> {
-+                    return IBlockData.a(dynamicops, iblockdata);
-+                })
-+        );
-         return (new Dynamic<T>(dynamicops, dynamicops.createMap(builder.build()))).getValue(); // Paper - decompile fix
-     }
- }
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java b/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java
 index 4fbc53068f..0faaec95fd 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureTreeBeehive.java