3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-16 03:20:07 +01:00
Paper/patches/server/0244-Configurable-speed-for-water-flowing-over-lava.patch

53 Zeilen
2.8 KiB
Diff

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
2023-09-22 00:01:00 +02:00
index 3d8def659e017e3d525c7b40eacaf579a5ba3b5b..4a1830f85f47014da63e4584f411d13f0f0cd8b3 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
2023-09-22 00:01:00 +02:00
@@ -108,11 +108,31 @@ public class LiquidBlock extends Block implements BucketPickup {
2021-06-11 14:02:28 +02:00
@Override
public void onPlace(BlockState state, Level world, BlockPos pos, BlockState oldState, boolean notify) {
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
2021-06-11 14:02:28 +02:00
}
}
+ // Paper start - Get flow speed. Throttle if its water and flowing adjacent to lava
+ 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);
+ }
2021-06-11 14:02:28 +02:00
+ // Paper end
+
@Override
2021-06-13 01:45:00 +02:00
public BlockState updateShape(BlockState state, Direction direction, BlockState neighborState, LevelAccessor world, BlockPos pos, BlockPos neighborPos) {
if (state.getFluidState().isSource() || neighborState.getFluidState().isSource()) {
2023-09-22 00:01:00 +02:00
@@ -125,7 +145,7 @@ public class LiquidBlock extends Block implements BucketPickup {
2021-06-11 14:02:28 +02:00
@Override
2022-06-07 23:45:11 +02:00
public 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
2021-06-11 14:02:28 +02:00
}
}