From 24cccab7181f3f1b9462a391540b50719b2384ab Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 11 Sep 2016 10:42:06 -0700 Subject: [PATCH] Fix Cactus being able top be planted on incorrect soil. --- patches/minecraft/net/minecraft/block/Block.java.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/minecraft/net/minecraft/block/Block.java.patch b/patches/minecraft/net/minecraft/block/Block.java.patch index 1d31ab3aa..9c34e2ec5 100644 --- a/patches/minecraft/net/minecraft/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/block/Block.java.patch @@ -899,9 +899,9 @@ + IBlockState plant = plantable.getPlant(world, pos.func_177972_a(direction)); + net.minecraftforge.common.EnumPlantType plantType = plantable.getPlantType(world, pos.func_177972_a(direction)); + -+ if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150434_aF && this == net.minecraft.init.Blocks.field_150434_aF) ++ if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150434_aF) + { -+ return true; ++ return this == net.minecraft.init.Blocks.field_150434_aF || this == net.minecraft.init.Blocks.field_150354_m; + } + + if (plant.func_177230_c() == net.minecraft.init.Blocks.field_150436_aH && this == net.minecraft.init.Blocks.field_150436_aH) @@ -916,7 +916,7 @@ + + switch (plantType) + { -+ case Desert: return this == net.minecraft.init.Blocks.field_150354_m || this == net.minecraft.init.Blocks.field_150405_ch || this == net.minecraft.init.Blocks.field_150406_ce || this == net.minecraft.init.Blocks.field_150346_d; ++ case Desert: return this == net.minecraft.init.Blocks.field_150354_m || this == net.minecraft.init.Blocks.field_150405_ch || this == net.minecraft.init.Blocks.field_150406_ce; + case Nether: return this == net.minecraft.init.Blocks.field_150425_aM; + case Crop: return this == net.minecraft.init.Blocks.field_150458_ak; + case Cave: return state.isSideSolid(world, pos, EnumFacing.UP);