From b54cce441f2bf0bc90a664cbf5bc77112355968a Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 13 Jul 2021 14:23:37 -0500 Subject: [PATCH] Fix #498 --- ...moisten-from-water-directly-under-it.patch | 28 ++----------------- ...re-add-farmland-mechanics-from-Alpha.patch | 4 +-- ...iefing-bypass-to-everything-affected.patch | 6 ++-- .../0152-Farmland-trampling-changes.patch | 4 +-- 4 files changed, 9 insertions(+), 33 deletions(-) diff --git a/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch b/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch index ec16a6e6d..43f7a9927 100644 --- a/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch +++ b/patches/server/0047-Allow-soil-to-moisten-from-water-directly-under-it.patch @@ -5,34 +5,10 @@ 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 -index a242a80b16c7d074d52a52728646224b1a0091d4..5d9d77cb382c8075af2713a0ce26c28a35a0aaa8 100644 +index a242a80b16c7d074d52a52728646224b1a0091d4..ee5bc54e37e5ae120e846ddd2cae5ca39c293c98 100644 --- a/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 { - return super.updateShape(state, direction, neighborState, world, pos, neighborPos); - } - -- @Override -- public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos) { -- BlockState iblockdata1 = world.getBlockState(pos.above()); -- -- return !iblockdata1.getMaterial().isSolid() || iblockdata1.getBlock() instanceof FenceGateBlock || iblockdata1.getBlock() instanceof MovingPistonBlock; -- } -- -- @Override -- public BlockState getStateForPlacement(BlockPlaceContext ctx) { -- return !this.defaultBlockState().canSurvive(ctx.getLevel(), ctx.getClickedPos()) ? Blocks.DIRT.defaultBlockState() : super.getStateForPlacement(ctx); -- } -- -- @Override -- public boolean useShapeForLightOcclusion(BlockState state) { -- return true; -- } -- - @Override - public VoxelShape getShape(BlockState state, BlockGetter world, BlockPos pos, CollisionContext context) { - return FarmBlock.SHAPE; -@@ -159,7 +142,7 @@ public class FarmBlock extends Block { +@@ -159,7 +159,7 @@ public class FarmBlock extends Block { } } diff --git a/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch b/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch index 986b683ae..97dfcd52e 100644 --- a/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch +++ b/patches/server/0117-Ability-to-re-add-farmland-mechanics-from-Alpha.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Ability to re-add farmland mechanics from Alpha 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 5d9d77cb382c8075af2713a0ce26c28a35a0aaa8..2d4d59eb5a534e4c283933b734c44776b674b2eb 100644 +index ee5bc54e37e5ae120e846ddd2cae5ca39c293c98..f2ddc1c9c4fa029544866b779b4b035924014048 100644 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java -@@ -96,6 +96,14 @@ public class FarmBlock extends Block { +@@ -113,6 +113,14 @@ public class FarmBlock extends Block { return; } diff --git a/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch b/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch index 4298f7e89..28146ed10 100644 --- a/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch +++ b/patches/server/0148-Add-mobGriefing-bypass-to-everything-affected.patch @@ -18,7 +18,7 @@ index b909eeba0539ab133e274a15b0b479b5546fc903..11abf0df677a9d609d82cbcb8e3967fc BlockState iblockdata = Blocks.WITHER_ROSE.defaultBlockState(); diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java -index 2f061e2825127e4a38e261ccacf56926a2421bb0..ec916af4cace6bdbe5412cbabcbfaed5b1198b39 100644 +index 11042a7b13e5029162ad977b5835c82afdfcfe74..67932ebc795c6d3b4b1956277ae9194c290ec599 100644 --- a/src/main/java/net/minecraft/world/entity/Mob.java +++ b/src/main/java/net/minecraft/world/entity/Mob.java @@ -657,7 +657,7 @@ public abstract class Mob extends LivingEntity { @@ -354,10 +354,10 @@ index 6dda5eeca4e310eceb2598322803bfafc184e9c7..3c51e6d419a244b9270119590aa29952 } 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 2d4d59eb5a534e4c283933b734c44776b674b2eb..aad204181c4f54ee533bfe3fc04a8705b847e371 100644 +index f2ddc1c9c4fa029544866b779b4b035924014048..2a33fbdc1d047584b0cd4b3da5892ccd7efc6943 100644 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java -@@ -82,7 +82,7 @@ public class FarmBlock extends Block { +@@ -99,7 +99,7 @@ public class FarmBlock extends Block { @Override public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) { super.fallOn(world, state, pos, entity, fallDistance); // CraftBukkit - moved here as game rules / events shouldn't affect fall damage. diff --git a/patches/server/0152-Farmland-trampling-changes.patch b/patches/server/0152-Farmland-trampling-changes.patch index a2f7f0aeb..c22fa4c33 100644 --- a/patches/server/0152-Farmland-trampling-changes.patch +++ b/patches/server/0152-Farmland-trampling-changes.patch @@ -12,10 +12,10 @@ necessary to trample in the first place. Feather Falling 1 requires you to fall over 3+ blocks to trample. FF 2 requires 4+, etc. 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 aad204181c4f54ee533bfe3fc04a8705b847e371..16eb80e7926cf4fe421c17d7d851d457a2bc0f5d 100644 +index 2a33fbdc1d047584b0cd4b3da5892ccd7efc6943..6bfaeaeb6f9accf269febbf3e0d71d575db32151 100644 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java -@@ -97,12 +97,20 @@ public class FarmBlock extends Block { +@@ -114,12 +114,20 @@ public class FarmBlock extends Block { } // Purpur start