craftbukkit/nms-patches/net/minecraft/world/level/block/VegetationBlock.patch

31 lines
1.6 KiB
Diff
Raw Normal View History

2025-03-26 03:05:00 +11:00
--- a/net/minecraft/world/level/block/VegetationBlock.java
+++ b/net/minecraft/world/level/block/VegetationBlock.java
2024-10-23 02:15:00 +11:00
@@ -12,6 +12,10 @@
import net.minecraft.world.level.block.state.IBlockData;
import net.minecraft.world.level.pathfinder.PathMode;
+// CraftBukkit start
+import net.minecraft.world.level.World;
+// CraftBukkit end
+
2025-03-26 03:05:00 +11:00
public abstract class VegetationBlock extends Block {
2024-10-23 02:15:00 +11:00
2025-03-26 03:05:00 +11:00
protected VegetationBlock(BlockBase.Info blockbase_info) {
2024-10-23 02:15:00 +11:00
@@ -27,7 +31,15 @@
2019-04-23 12:00:00 +10:00
@Override
2024-10-23 02:15:00 +11:00
protected IBlockData updateShape(IBlockData iblockdata, IWorldReader iworldreader, ScheduledTickAccess scheduledtickaccess, BlockPosition blockposition, EnumDirection enumdirection, BlockPosition blockposition1, IBlockData iblockdata1, RandomSource randomsource) {
- return !iblockdata.canSurvive(iworldreader, blockposition) ? Blocks.AIR.defaultBlockState() : super.updateShape(iblockdata, iworldreader, scheduledtickaccess, blockposition, enumdirection, blockposition1, iblockdata1, randomsource);
2018-07-15 10:00:00 +10:00
+ // CraftBukkit start
2024-10-23 02:15:00 +11:00
+ if (!iblockdata.canSurvive(iworldreader, blockposition)) {
+ // Suppress during worldgen
+ if (!(iworldreader instanceof World world) || !org.bukkit.craftbukkit.event.CraftEventFactory.callBlockPhysicsEvent(world, blockposition).isCancelled()) {
2021-11-22 09:00:00 +11:00
+ return Blocks.AIR.defaultBlockState();
+ }
2018-07-15 10:00:00 +10:00
+ }
2024-10-23 02:15:00 +11:00
+ return super.updateShape(iblockdata, iworldreader, scheduledtickaccess, blockposition, enumdirection, blockposition1, iblockdata1, randomsource);
2018-07-15 10:00:00 +10:00
+ // CraftBukkit end
}
2019-04-23 12:00:00 +10:00
@Override