mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-22 12:54:49 +02:00
0cdce89d59
If a playerdata doesn't contain a valid, loaded world, reset to the main world spawn point
25 lines
1.5 KiB
Diff
25 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 4dae2a98070affd84bc4523a927dc9cbfe7379c6..2548244c089dff583c8c424dcaa5504caedf3f10 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/BuddingAmethystBlock.java
|
|
@@ -38,7 +38,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
|
|
}
|
|
|
|
}
|