diff options
| author | Nassim Jahnke <[email protected]> | 2022-09-12 13:31:45 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2022-09-12 13:31:45 +0200 |
| commit | ef0e5a642d33ac62f070c45a61cb42647b2744cd (patch) | |
| tree | 70dff1b36e6d4306f059b3c8e335527af00adf73 /patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch | |
| parent | 51183af967aafb3d57dc19421da1bcb0aea9d3d2 (diff) | |
| download | Paper-ef0e5a642d33ac62f070c45a61cb42647b2744cd.tar.gz Paper-ef0e5a642d33ac62f070c45a61cb42647b2744cd.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot)
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:
9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API
48c0c547 PR-786: Add methods to get sounds from entities
CraftBukkit Changes:
5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event
4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation
4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API
e5d6a9bbf PR-1100: Add methods to get sounds from entities
b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta
Spigot Changes:
4c157bb4 Rebuild patches
Diffstat (limited to 'patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch')
| -rw-r--r-- | patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch b/patches/server/0772-Fix-CocaoDecorator-causing-a-crash-when-trying-to-ge.patch new file mode 100644 index 0000000000..b415f668ab --- /dev/null +++ b/patches/server/0772-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 <[email protected]> +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(); |