forked from LeavesMC/Leaves
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
23a3012
commit 89c0a99
Showing
2 changed files
with
37 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
From: violetc <[email protected]> | ||
Date: Mon, 22 Jan 2024 11:15:53 +0800 | ||
Subject: [PATCH] Renewable deepslate | ||
|
||
|
||
diff --git a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java | ||
index 2bd097203f1e92d3fc343f91dc37220e09dd5066..f1e5b270d46739d8c70d6cab0cda598af331c360 100644 | ||
--- a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java | ||
+++ b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java | ||
@@ -192,7 +192,7 @@ public class LiquidBlock extends Block implements BucketPickup { | ||
BlockPos blockposition1 = pos.relative(enumdirection.getOpposite()); | ||
|
||
if (world.getFluidState(blockposition1).is(FluidTags.WATER)) { | ||
- Block block = world.getFluidState(pos).isSource() ? Blocks.OBSIDIAN : Blocks.COBBLESTONE; | ||
+ 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 | ||
|
||
// CraftBukkit start | ||
if (org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world, pos, block.defaultBlockState())) { | ||
diff --git a/src/main/java/net/minecraft/world/level/material/LavaFluid.java b/src/main/java/net/minecraft/world/level/material/LavaFluid.java | ||
index 3bb4a9a1a6249e8ba2de237f801210e7f4fd5825..f9d386db467b608430b3abcfc609594db8a29b76 100644 | ||
--- a/src/main/java/net/minecraft/world/level/material/LavaFluid.java | ||
+++ b/src/main/java/net/minecraft/world/level/material/LavaFluid.java | ||
@@ -211,7 +211,7 @@ public abstract class LavaFluid extends FlowingFluid { | ||
if (this.is(FluidTags.LAVA) && fluid1.is(FluidTags.WATER)) { | ||
if (state.getBlock() instanceof LiquidBlock) { | ||
// CraftBukkit start | ||
- if (!org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockFormEvent(world.getMinecraftWorld(), pos, Blocks.STONE.defaultBlockState(), 3)) { | ||
+ 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 | ||
return; | ||
} | ||
// CraftBukkit end |