keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Sync up canPlaceTorchOnTop logic with BlockTorch#isValidPosition

Browse source
This commit is contained in:
tterrag 2019-04-24 00:59:03 -04:00
parent 822dce47cd
commit a4cf5951ca
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
patches/minecraft/net/minecraft/item/BlockItemUseContext.java.patch
View file

@ -1,14 +1,6 @@
--- a/net/minecraft/item/BlockItemUseContext.java --- a/net/minecraft/item/BlockItemUseContext.java
+++ b/net/minecraft/item/BlockItemUseContext.java +++ b/net/minecraft/item/BlockItemUseContext.java
@@ -5,6 +5,7 @@ @@ -25,7 +25,7 @@
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
+import net.minecraftforge.event.terraingen.BiomeEvent.GetGrassColor;
public class BlockItemUseContext extends ItemUseContext {
private final BlockPos field_196014_j;
@@ -25,7 +26,7 @@
} }
public boolean func_196011_b() { public boolean func_196011_b() {

3
src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java
View file

@ -465,9 +465,10 @@ public interface IForgeBlock
*/ */
default boolean canPlaceTorchOnTop(IBlockState state, IWorldReaderBase world, BlockPos pos) default boolean canPlaceTorchOnTop(IBlockState state, IWorldReaderBase world, BlockPos pos)
{ {
// Keep conditionals in sync with BlockTorch#isValidPosition
if (this == Blocks.END_GATEWAY) { if (this == Blocks.END_GATEWAY) {
return false; return false;
} else if (state.isTopSolid() || this instanceof BlockFence || this == Blocks.GLASS || this == Blocks.COBBLESTONE_WALL || this instanceof BlockStainedGlass) { } else if (this instanceof BlockFence || this instanceof BlockStainedGlass || this == Blocks.GLASS || this == Blocks.COBBLESTONE_WALL || this == Blocks.MOSSY_COBBLESTONE_WALL || state.isTopSolid()) {
return true; return true;
} else { } else {
BlockFaceShape shape = state.getBlockFaceShape(world, pos, EnumFacing.UP); BlockFaceShape shape = state.getBlockFaceShape(world, pos, EnumFacing.UP);