From 58456c85af351303263af9a5495e84e6f5f2bebd Mon Sep 17 00:00:00 2001 From: ferriarnus <61201275+ferriarnus@users.noreply.github.com> Date: Wed, 15 Mar 2023 19:50:31 +0100 Subject: [PATCH] Fix StemBlock not checking canSustainPlant for the correct block It now checks for Melons/Pumpkins instead of the stem itself. --- .../world/level/block/StemBlock.java.patch | 5 ++-- .../level/block/StemGrownBlock.java.patch | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 patches/minecraft/net/minecraft/world/level/block/StemGrownBlock.java.patch diff --git a/patches/minecraft/net/minecraft/world/level/block/StemBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/StemBlock.java.patch index 9b8443fd53..05df65a92c 100644 --- a/patches/minecraft/net/minecraft/world/level/block/StemBlock.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/StemBlock.java.patch @@ -1,6 +1,6 @@ --- a/net/minecraft/world/level/block/StemBlock.java +++ b/net/minecraft/world/level/block/StemBlock.java -@@ -43,22 +_,24 @@ +@@ -43,22 +_,23 @@ } public void m_213898_(BlockState p_222538_, ServerLevel p_222539_, BlockPos p_222540_, RandomSource p_222541_) { @@ -19,8 +19,7 @@ BlockPos blockpos = p_222540_.m_121945_(direction); BlockState blockstate = p_222539_.m_8055_(blockpos.m_7495_()); - if (p_222539_.m_8055_(blockpos).m_60795_() && (blockstate.m_60713_(Blocks.f_50093_) || blockstate.m_204336_(BlockTags.f_144274_))) { -+ Block block = blockstate.m_60734_(); -+ if (p_222539_.m_46859_(blockpos) && (blockstate.canSustainPlant(p_222539_, blockpos.m_7495_(), Direction.UP, this) || block == Blocks.f_50093_ || block == Blocks.f_50493_ || block == Blocks.f_50546_ || block == Blocks.f_50599_ || block == Blocks.f_50440_)) { ++ if (p_222539_.m_46859_(blockpos) && (blockstate.canSustainPlant(p_222539_, blockpos.m_7495_(), Direction.UP, this.f_57015_) || blockstate.m_60713_(Blocks.f_50093_) || blockstate.m_204336_(BlockTags.f_144274_))) { p_222539_.m_46597_(blockpos, this.f_57015_.m_49966_()); p_222539_.m_46597_(p_222540_, this.f_57015_.m_7810_().m_49966_().m_61124_(HorizontalDirectionalBlock.f_54117_, direction)); } diff --git a/patches/minecraft/net/minecraft/world/level/block/StemGrownBlock.java.patch b/patches/minecraft/net/minecraft/world/level/block/StemGrownBlock.java.patch new file mode 100644 index 0000000000..4df30e4b2e --- /dev/null +++ b/patches/minecraft/net/minecraft/world/level/block/StemGrownBlock.java.patch @@ -0,0 +1,23 @@ +--- a/net/minecraft/world/level/block/StemGrownBlock.java ++++ b/net/minecraft/world/level/block/StemGrownBlock.java +@@ -2,7 +_,7 @@ + + import net.minecraft.world.level.block.state.BlockBehaviour; + +-public abstract class StemGrownBlock extends Block { ++public abstract class StemGrownBlock extends Block implements net.minecraftforge.common.IPlantable { + public StemGrownBlock(BlockBehaviour.Properties p_57058_) { + super(p_57058_); + } +@@ -10,4 +_,11 @@ + public abstract StemBlock m_7161_(); + + public abstract AttachedStemBlock m_7810_(); ++ ++ @Override ++ public net.minecraft.world.level.block.state.BlockState getPlant(net.minecraft.world.level.BlockGetter world, net.minecraft.core.BlockPos pos) { ++ net.minecraft.world.level.block.state.BlockState state = world.m_8055_(pos); ++ if (state.m_60734_() != this) return m_49966_(); ++ return state; ++ } + }