diff --git a/patches/server/0805-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0805-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
new file mode 100644
index 0000000000..2ce994e362
--- /dev/null
+++ b/patches/server/0805-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Tue, 7 Sep 2021 21:29:38 +0100
+Subject: [PATCH] Fix CocaoDecorator causing a crash when trying to generate
+ without logs
+
+
+diff --git a/src/main/java/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java b/src/main/java/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java
+index c1d220726ca0877fb526e710ae07329b4705a8e5..4474586d199a12f1311ee3ad307b342f4be3690e 100644
+--- a/src/main/java/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java
++++ b/src/main/java/net/minecraft/world/level/levelgen/feature/treedecorators/CocoaDecorator.java
+@@ -29,6 +29,7 @@ public class CocoaDecorator extends TreeDecorator {
+ 
+     @Override
+     public void place(LevelSimulatedReader world, BiConsumer<BlockPos, BlockState> replacer, Random random, List<BlockPos> logPositions, List<BlockPos> leavesPositions) {
++        if (logPositions.isEmpty()) return; // Paper
+         if (!(random.nextFloat() >= this.probability)) {
+             int i = logPositions.get(0).getY();
+             logPositions.stream().filter((pos) -> {