|
| 1 | +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 |
| 2 | + |
| 3 | +Date: Mon, 22 Jan 2024 11:15:53 +0800 |
| 4 | +Subject: [PATCH] Renewable deepslate |
| 5 | + |
| 6 | + |
| 7 | +diff --git a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java |
| 8 | +index 2bd097203f1e92d3fc343f91dc37220e09dd5066..f1e5b270d46739d8c70d6cab0cda598af331c360 100644 |
| 9 | +--- a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java |
| 10 | ++++ b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java |
| 11 | +@@ -192,7 +192,7 @@ public class LiquidBlock extends Block implements BucketPickup { |
| 12 | + BlockPos blockposition1 = pos.relative(enumdirection.getOpposite()); |
| 13 | + |
| 14 | + if (world.getFluidState(blockposition1).is(FluidTags.WATER)) { |
| 15 | +- Block block = world.getFluidState(pos).isSource() ? Blocks.OBSIDIAN : Blocks.COBBLESTONE; |
| 16 | ++ Block block = world.getFluidState(pos).isSource() ? Blocks.OBSIDIAN : (top.leavesmc.leaves.LeavesConfig.renewableDeepslate && world.dimension() == Level.OVERWORLD && pos.getY() < 0 ? Blocks.COBBLED_DEEPSLATE : Blocks.COBBLESTONE); // Leaves - renewable deepslate |
| 17 | + |
| 18 | + // CraftBukkit start |
| 19 | + if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, pos, block.defaultBlockState())) { |
| 20 | +diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java |
| 21 | +index 3bb4a9a1a6249e8ba2de237f801210e7f4fd5825..f9d386db467b608430b3abcfc609594db8a29b76 100644 |
| 22 | +--- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java |
| 23 | ++++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java |
| 24 | +@@ -211,7 +211,7 @@ public abstract class LavaFluid extends FlowingFluid { |
| 25 | + if (this.is(FluidTags.LAVA) && fluid1.is(FluidTags.WATER)) { |
| 26 | + if (state.getBlock() instanceof LiquidBlock) { |
| 27 | + // CraftBukkit start |
| 28 | +- if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world.getMinecraftWorld(), pos, Blocks.STONE.defaultBlockState(), 3)) { |
| 29 | ++ if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world.getMinecraftWorld(), pos, top.leavesmc.leaves.LeavesConfig.renewableDeepslate && world.getMinecraftWorld().dimension() == Level.OVERWORLD && pos.getY() < 0 ? Blocks.DEEPSLATE.defaultBlockState() : Blocks.STONE.defaultBlockState(), 3)) { // Leaves - renewable deepslate |
| 30 | + return; |
| 31 | + } |
| 32 | + // CraftBukkit end |
0 commit comments