mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 11:59:25 +00:00
113 lines
4.9 KiB
Diff
113 lines
4.9 KiB
Diff
--- ../src-base/minecraft/net/minecraft/block/BlockTorch.java
|
|
+++ ../src-work/minecraft/net/minecraft/block/BlockTorch.java
|
|
@@ -10,6 +10,9 @@
|
|
import net.minecraft.util.Vec3;
|
|
import net.minecraft.world.World;
|
|
|
|
+import net.minecraftforge.common.ForgeDirection;
|
|
+import static net.minecraftforge.common.ForgeDirection.*;
|
|
+
|
|
public class BlockTorch extends Block
|
|
{
|
|
protected BlockTorch(int par1)
|
|
@@ -65,7 +68,7 @@
|
|
else
|
|
{
|
|
int l = par1World.getBlockId(par2, par3, par4);
|
|
- return l == Block.fence.blockID || l == Block.netherFence.blockID || l == Block.glass.blockID || l == Block.cobblestoneWall.blockID;
|
|
+ return (Block.blocksList[l] != null && Block.blocksList[l].canPlaceTorchOnTop(par1World, par2, par3, par4));
|
|
}
|
|
}
|
|
|
|
@@ -74,7 +77,11 @@
|
|
*/
|
|
public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4)
|
|
{
|
|
- return par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true) ? true : (par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true) ? true : (par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true) ? true : (par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true) ? true : this.canPlaceTorchOn(par1World, par2, par3 - 1, par4))));
|
|
+ return par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST, true) ||
|
|
+ par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST, true) ||
|
|
+ par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH, true) ||
|
|
+ par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH, true) ||
|
|
+ canPlaceTorchOn(par1World, par2, par3 - 1, par4);
|
|
}
|
|
|
|
/**
|
|
@@ -89,22 +96,22 @@
|
|
j1 = 5;
|
|
}
|
|
|
|
- if (par5 == 2 && par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true))
|
|
+ if (par5 == 2 && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH, true))
|
|
{
|
|
j1 = 4;
|
|
}
|
|
|
|
- if (par5 == 3 && par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true))
|
|
+ if (par5 == 3 && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH, true))
|
|
{
|
|
j1 = 3;
|
|
}
|
|
|
|
- if (par5 == 4 && par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true))
|
|
+ if (par5 == 4 && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST, true))
|
|
{
|
|
j1 = 2;
|
|
}
|
|
|
|
- if (par5 == 5 && par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true))
|
|
+ if (par5 == 5 && par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST, true))
|
|
{
|
|
j1 = 1;
|
|
}
|
|
@@ -132,19 +139,19 @@
|
|
{
|
|
if (par1World.getBlockMetadata(par2, par3, par4) == 0)
|
|
{
|
|
- if (par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true))
|
|
+ if (par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST, true))
|
|
{
|
|
par1World.setBlockMetadataWithNotify(par2, par3, par4, 1, 2);
|
|
}
|
|
- else if (par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true))
|
|
+ else if (par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST, true))
|
|
{
|
|
par1World.setBlockMetadataWithNotify(par2, par3, par4, 2, 2);
|
|
}
|
|
- else if (par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true))
|
|
+ else if (par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH, true))
|
|
{
|
|
par1World.setBlockMetadataWithNotify(par2, par3, par4, 3, 2);
|
|
}
|
|
- else if (par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true))
|
|
+ else if (par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH, true))
|
|
{
|
|
par1World.setBlockMetadataWithNotify(par2, par3, par4, 4, 2);
|
|
}
|
|
@@ -173,22 +180,22 @@
|
|
int i1 = par1World.getBlockMetadata(par2, par3, par4);
|
|
boolean flag = false;
|
|
|
|
- if (!par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true) && i1 == 1)
|
|
+ if (!par1World.isBlockSolidOnSide(par2 - 1, par3, par4, EAST, true) && i1 == 1)
|
|
{
|
|
flag = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true) && i1 == 2)
|
|
+ if (!par1World.isBlockSolidOnSide(par2 + 1, par3, par4, WEST, true) && i1 == 2)
|
|
{
|
|
flag = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true) && i1 == 3)
|
|
+ if (!par1World.isBlockSolidOnSide(par2, par3, par4 - 1, SOUTH, true) && i1 == 3)
|
|
{
|
|
flag = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true) && i1 == 4)
|
|
+ if (!par1World.isBlockSolidOnSide(par2, par3, par4 + 1, NORTH, true) && i1 == 4)
|
|
{
|
|
flag = true;
|
|
}
|