mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-24 09:56:48 +02:00
dc684c60d1
The new behavior of disconnect to block the current thread until the disconnect succeeded is better than throwing it off to happen at some point
24 lines
1.5 KiB
Diff
24 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jacob Litewski <jacob.litewski@gmail.com>
|
|
Date: Tue, 13 Jun 2023 19:16:39 -0400
|
|
Subject: [PATCH] Make Amethyst throw both Spread and Grow Events
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java b/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
|
|
index 6c402bfd9bed54cbb9b337d3528fdcffbd3d87c0..8920855b07a31715327b8102c7faafc9f916825d 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
|
|
@@ -45,7 +45,13 @@ public class BuddingAmethystBlock extends AmethystBlock {
|
|
if (block != null) {
|
|
BlockState iblockdata2 = (BlockState) ((BlockState) block.defaultBlockState().setValue(AmethystClusterBlock.FACING, enumdirection)).setValue(AmethystClusterBlock.WATERLOGGED, iblockdata1.getFluidState().getType() == Fluids.WATER);
|
|
|
|
+ // Paper start - Have Amethyst throw both spread and grow events
|
|
+ if (block == Blocks.SMALL_AMETHYST_BUD) {
|
|
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockSpreadEvent(world, pos, blockposition1, iblockdata2); // CraftBukkit
|
|
+ } else {
|
|
+ org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, blockposition1, iblockdata2);
|
|
+ }
|
|
+ // Paper end - Have Amethyst throw both spread and grow events
|
|
}
|
|
|
|
}
|