100 lines
4.5 KiB
Diff
100 lines
4.5 KiB
Diff
--- ../src_base/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000
|
|
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLever.java 0000-00-00 00:00:00.000000000 -0000
|
|
@@ -46,7 +46,11 @@
|
|
*/
|
|
public boolean canPlaceBlockOnSide(World par1World, int par2, int par3, int par4, int par5)
|
|
{
|
|
- return par5 == 1 && par1World.isBlockNormalCube(par2, par3 - 1, par4) ? true : (par5 == 2 && par1World.isBlockNormalCube(par2, par3, par4 + 1) ? true : (par5 == 3 && par1World.isBlockNormalCube(par2, par3, par4 - 1) ? true : (par5 == 4 && par1World.isBlockNormalCube(par2 + 1, par3, par4) ? true : par5 == 5 && par1World.isBlockNormalCube(par2 - 1, par3, par4))));
|
|
+ return (par5 == 1 && par1World.isBlockSolidOnSide(par2, par3 - 1, par4, 1)) ||
|
|
+ (par5 == 2 && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, 2)) ||
|
|
+ (par5 == 3 && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, 3)) ||
|
|
+ (par5 == 4 && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, 4)) ||
|
|
+ (par5 == 5 && par1World.isBlockSolidOnSide(par2 - 1, par3, par4, 5));
|
|
}
|
|
|
|
/**
|
|
@@ -54,7 +58,11 @@
|
|
*/
|
|
public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4)
|
|
{
|
|
- return par1World.isBlockNormalCube(par2 - 1, par3, par4) ? true : (par1World.isBlockNormalCube(par2 + 1, par3, par4) ? true : (par1World.isBlockNormalCube(par2, par3, par4 - 1) ? true : (par1World.isBlockNormalCube(par2, par3, par4 + 1) ? true : par1World.isBlockNormalCube(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) ||
|
|
+ par1World.isBlockSolidOnSide(par2, par3 - 1, par4, 1);
|
|
}
|
|
|
|
/**
|
|
@@ -68,27 +76,27 @@
|
|
var6 &= 7;
|
|
var6 = -1;
|
|
|
|
- if (par5 == 1 && par1World.isBlockNormalCube(par2, par3 - 1, par4))
|
|
+ if (par5 == 1 && par1World.isBlockSolidOnSide(par2, par3 - 1, par4, 1))
|
|
{
|
|
var6 = 5 + par1World.rand.nextInt(2);
|
|
}
|
|
|
|
- if (par5 == 2 && par1World.isBlockNormalCube(par2, par3, par4 + 1))
|
|
+ if (par5 == 2 && par1World.isBlockSolidOnSide(par2, par3, par4 + 1, 2))
|
|
{
|
|
var6 = 4;
|
|
}
|
|
|
|
- if (par5 == 3 && par1World.isBlockNormalCube(par2, par3, par4 - 1))
|
|
+ if (par5 == 3 && par1World.isBlockSolidOnSide(par2, par3, par4 - 1, 3))
|
|
{
|
|
var6 = 3;
|
|
}
|
|
|
|
- if (par5 == 4 && par1World.isBlockNormalCube(par2 + 1, par3, par4))
|
|
+ if (par5 == 4 && par1World.isBlockSolidOnSide(par2 + 1, par3, par4, 4))
|
|
{
|
|
var6 = 2;
|
|
}
|
|
|
|
- if (par5 == 5 && par1World.isBlockNormalCube(par2 - 1, par3, par4))
|
|
+ if (par5 == 5 && par1World.isBlockSolidOnSide(par2 - 1, par3, par4, 5))
|
|
{
|
|
var6 = 1;
|
|
}
|
|
@@ -115,32 +123,32 @@
|
|
int var6 = par1World.getBlockMetadata(par2, par3, par4) & 7;
|
|
boolean var7 = false;
|
|
|
|
- if (!par1World.isBlockNormalCube(par2 - 1, par3, par4) && var6 == 1)
|
|
+ if (!par1World.isBlockSolidOnSide(par2 - 1, par3, par4, 5) && var6 == 1)
|
|
{
|
|
var7 = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCube(par2 + 1, par3, par4) && var6 == 2)
|
|
+ if (!par1World.isBlockSolidOnSide(par2 + 1, par3, par4, 4) && var6 == 2)
|
|
{
|
|
var7 = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCube(par2, par3, par4 - 1) && var6 == 3)
|
|
+ if (!par1World.isBlockSolidOnSide(par2, par3, par4 - 1, 3) && var6 == 3)
|
|
{
|
|
var7 = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCube(par2, par3, par4 + 1) && var6 == 4)
|
|
+ if (!par1World.isBlockSolidOnSide(par2, par3, par4 + 1, 2) && var6 == 4)
|
|
{
|
|
var7 = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCube(par2, par3 - 1, par4) && var6 == 5)
|
|
+ if (!par1World.isBlockSolidOnSide(par2, par3 - 1, par4, 1) && var6 == 5)
|
|
{
|
|
var7 = true;
|
|
}
|
|
|
|
- if (!par1World.isBlockNormalCube(par2, par3 - 1, par4) && var6 == 6)
|
|
+ if (!par1World.isBlockSolidOnSide(par2, par3 - 1, par4, 1) && var6 == 6)
|
|
{
|
|
var7 = true;
|
|
}
|