Paper/patches/server/0236-Configurable-speed-for-water-flowing-over-lava.patch

53 lines
2.9 KiB
Diff
Raw Normal View History

2021-06-11 14:02:28 +02:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Byteflux <byte@byteflux.net>
Date: Wed, 8 Aug 2018 16:33:21 -0600
Subject: [PATCH] Configurable speed for water flowing over lava
diff --git a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
2024-04-24 04:46:06 +02:00
index 6d24989965e5215c1e256444a868633cf2772aa3..84623c632d8c2f0fa7ec939c711316d757117d23 100644
2021-06-11 14:02:28 +02:00
--- a/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/LiquidBlock.java
2024-04-24 04:46:06 +02:00
@@ -138,11 +138,31 @@ public class LiquidBlock extends Block implements BucketPickup {
2021-06-11 14:02:28 +02:00
@Override
2024-04-24 04:46:06 +02:00
protected void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) {
2021-06-11 14:02:28 +02:00
if (this.shouldSpreadLiquid(world, pos, state)) {
- world.scheduleTick(pos, state.getFluidState().getType(), this.fluid.getTickDelay(world));
+ world.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(world, pos)); // Paper - Configurable speed for water flowing over lava
2021-06-11 14:02:28 +02:00
}
}
+ // Paper start - Configurable speed for water flowing over lava
2021-06-11 14:02:28 +02:00
+ public int getFlowSpeed(Level world, BlockPos blockposition) {
2023-06-07 23:46:56 +02:00
+ if (net.minecraft.core.registries.BuiltInRegistries.FLUID.wrapAsHolder(this.fluid).is(FluidTags.WATER)) {
2021-06-11 14:02:28 +02:00
+ if (
2023-06-07 23:46:56 +02:00
+ isLava(world, blockposition.north(1)) ||
+ isLava(world, blockposition.south(1)) ||
+ isLava(world, blockposition.west(1)) ||
+ isLava(world, blockposition.east(1))
2021-06-11 14:02:28 +02:00
+ ) {
+ return world.paperConfig().environment.waterOverLavaFlowSpeed;
2021-06-11 14:02:28 +02:00
+ }
+ }
+ return this.fluid.getTickDelay(world);
+ }
2023-06-07 23:46:56 +02:00
+ private static boolean isLava(Level world, BlockPos blockPos) {
+ final FluidState fluidState = world.getFluidIfLoaded(blockPos);
+ return fluidState != null && fluidState.is(FluidTags.LAVA);
+ }
+ // Paper end - Configurable speed for water flowing over lava
2021-06-11 14:02:28 +02:00
+
@Override
2024-04-24 04:46:06 +02:00
protected BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
2021-06-13 01:45:00 +02:00
if (state.getFluidState().isSource() || neighborState.getFluidState().isSource()) {
2024-04-24 04:46:06 +02:00
@@ -155,7 +175,7 @@ public class LiquidBlock extends Block implements BucketPickup {
2021-06-11 14:02:28 +02:00
@Override
2024-04-24 04:46:06 +02:00
protected void neighborChanged(BlockState state, Level world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) {
2021-06-11 14:02:28 +02:00
if (this.shouldSpreadLiquid(world, pos, state)) {
- world.scheduleTick(pos, state.getFluidState().getType(), this.fluid.getTickDelay(world));
+ world.scheduleTick(pos, state.getFluidState().getType(), this.getFlowSpeed(world, pos)); // Paper - Configurable speed for water flowing over lava
2021-06-11 14:02:28 +02:00
}
}