103 lines
4.4 KiB
Diff
103 lines
4.4 KiB
Diff
--- ../src_base/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000
|
|
+++ ../src_work/minecraft/net/minecraft/src/BlockTorch.java 0000-00-00 00:00:00.000000000 -0000
|
|
@@ -49,7 +49,7 @@
|
|
*/
|
|
private boolean canPlaceTorchOn(World par1World, int par2, int par3, int par4)
|
|
{
|
|
- if (par1World.isBlockNormalCubeDefault(par2, par3, par4, true))
|
|
+ if (par1World.isBlockSolidOnSide(par2, par3, par4, 1))
|
|
{
|
|
return true;
|
|
}
|
|
@@ -83,7 +83,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, 5) ||
|
|
+ par1World.isBlockSolidOnSide(par2 + 1, par3, par4, 4) ||
|
|
+ par1World.isBlockSolidOnSide(par2, par3, par4 - 1, 3) ||
|
|
+ par1World.isBlockSolidOnSide(par2, par3, par4 + 1, 2) ||
|
|
+ canPlaceTorchOn(par1World, par2, par3 - 1, par4);
|
|
}
|
|
|
|
/**
|
|
@@ -99,22 +103,22 @@
|
|
var6 = 5;
|
|
}
|
|
|
|
- if (par5 == 2 && par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true))
|
|
+ if (par5 == 2 && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, 2))
|
|
{
|
|
var6 = 4;
|
|
}
|
|
|
|
- if (par5 == 3 && par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true))
|
|
+ if (par5 == 3 && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, 3))
|
|
{
|
|
var6 = 3;
|
|
}
|
|
|
|
- if (par5 == 4 && par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true))
|
|
+ if (par5 == 4 && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, 4))
|
|
{
|
|
var6 = 2;
|
|
}
|
|
|
|
- if (par5 == 5 && par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true))
|
|
+ if (par5 == 5 && par1World.isBlockSolidOnSide(par2 - 1, par3, par4, 5))
|
|
{
|
|
var6 = 1;
|
|
}
|
|
@@ -140,19 +144,19 @@
|
|
*/
|
|
public void onBlockAdded(World par1World, int par2, int par3, int par4)
|
|
{
|
|
- if (par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true))
|
|
+ if (par1World.isBlockSolidOnSide(par2 - 1, par3, par4, 5))
|
|
{
|
|
par1World.setBlockMetadataWithNotify(par2, par3, par4, 1);
|
|
}
|
|
- else if (par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true))
|
|
+ else if (par1World.isBlockSolidOnSide(par2 + 1, par3, par4, 4))
|
|
{
|
|
par1World.setBlockMetadataWithNotify(par2, par3, par4, 2);
|
|
}
|
|
- else if (par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true))
|
|
+ else if (par1World.isBlockSolidOnSide(par2, par3, par4 - 1, 3))
|
|
{
|
|
par1World.setBlockMetadataWithNotify(par2, par3, par4, 3);
|
|
}
|
|
- else if (par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true))
|
|
+ else if (par1World.isBlockSolidOnSide(par2, par3, par4 + 1, 2))
|
|
{
|
|
par1World.setBlockMetadataWithNotify(par2, par3, par4, 4);
|
|
}
|
|
@@ -175,22 +179,22 @@
|
|
int var6 = par1World.getBlockMetadata(par2, par3, par4);
|
|
boolean var7 = false;
|
|
|
|
- if (!par1World.isBlockNormalCubeDefault(par2 - 1, par3, par4, true) && var6 == 1)
|
|
+ if (!par1World.isBlockSolidOnSide(par2 - 1, par3, par4, 5) && var6 == 1)
|
|
{
|
|
var7 = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCubeDefault(par2 + 1, par3, par4, true) && var6 == 2)
|
|
+ if (!par1World.isBlockSolidOnSide(par2 + 1, par3, par4, 4) && var6 == 2)
|
|
{
|
|
var7 = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCubeDefault(par2, par3, par4 - 1, true) && var6 == 3)
|
|
+ if (!par1World.isBlockSolidOnSide(par2, par3, par4 - 1, 3) && var6 == 3)
|
|
{
|
|
var7 = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCubeDefault(par2, par3, par4 + 1, true) && var6 == 4)
|
|
+ if (!par1World.isBlockSolidOnSide(par2, par3, par4 + 1, 2) && var6 == 4)
|
|
{
|
|
var7 = true;
|
|
}
|