mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-29 00:04:50 +02:00
928bcc8d3a
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
20 lines
1.1 KiB
Diff
20 lines
1.1 KiB
Diff
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 42b4b306ee89a9e422d234bdaa9b43b118f8bd0a..0fc355bd847749f7ce716b283dd571f143824795 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
|
|
@@ -25,6 +25,7 @@ public class CocoaDecorator extends TreeDecorator {
|
|
|
|
@Override
|
|
public void place(TreeDecorator.Context generator) {
|
|
+ if (generator.logs().isEmpty()) return; // Paper
|
|
RandomSource randomSource = generator.random();
|
|
if (!(randomSource.nextFloat() >= this.probability)) {
|
|
List<BlockPos> list = generator.logs();
|