Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-18 00:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix farmland again

Browse Source
This commit is contained in:
William Blake Galbreath
2021-07-06 20:20:52 -05:00
parent 72b7a9a950
commit 045bcb4ea9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Allow soil to moisten from water directly under it
diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
index aa1ba8b74ab70b6cede99e4853ac0203f388ab06..9de505045c6b967d022a062e988de93bde8e1edf 100644 index aa1ba8b74ab70b6cede99e4853ac0203f388ab06..7c636d601fde4aeae29cfcca4bf49ea05a8b4f4c 100644
--- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
@@ -50,23 +50,6 @@ public class FarmBlock extends Block { @@ -50,23 +50,6 @@ public class FarmBlock extends Block {
@@ -32,15 +32,15 @@ index aa1ba8b74ab70b6cede99e4853ac0203f388ab06..9de505045c6b967d022a062e988de93b
@Override @Override
public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) {
return FarmBlock.SHAPE; return FarmBlock.SHAPE;
@@ -151,7 +134,7 @@ public class FarmBlock extends Block { @@ -145,7 +128,7 @@ public class FarmBlock extends Block {
do {
if (!iterator.hasNext()) {
- return false;
+ return ((ServerLevel) world).purpurConfig.farmlandGetsMoistFromBelow && world.getFluidState(pos.relative(Direction.DOWN)).is(FluidTags.WATER); // Purpur
}
blockposition1 = (BlockPos) iterator.next(); blockposition1 = (BlockPos) iterator.next();
} while (!world.getFluidState(blockposition1).is((Tag) FluidTags.WATER));
- return true;
+ return !((ServerLevel) world).purpurConfig.farmlandGetsMoistFromBelow || world.getFluidState(pos.relative(Direction.DOWN)).is(FluidTags.WATER); // Purpur
}
@Override
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index 1849f7970c5356f84a2b50a2a1f1b9742d822c67..8164b35f2c2d80a6b75ac10bd4fe293e47da3eba 100644 index 1849f7970c5356f84a2b50a2a1f1b9742d822c67..8164b35f2c2d80a6b75ac10bd4fe293e47da3eba 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java