2011-10-10 23:47:30 +00:00
|
|
|
--- ../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
|
2011-11-30 19:00:43 +00:00
|
|
|
@@ -40,44 +40,44 @@
|
2011-10-09 04:21:29 +00:00
|
|
|
|
|
|
|
public boolean canPlaceBlockOnSide(World world, int i, int j, int k, int l)
|
|
|
|
{
|
|
|
|
- if(l == 1 && world.isBlockNormalCube(i, j - 1, k))
|
|
|
|
+ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
- if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
|
|
|
|
+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
- if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
|
|
|
|
+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
- if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
|
|
|
|
+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
- return l == 5 && world.isBlockNormalCube(i - 1, j, k);
|
|
|
|
+ return l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5);
|
|
|
|
}
|
|
|
|
|
|
|
|
public boolean canPlaceBlockAt(World world, int i, int j, int k)
|
|
|
|
{
|
|
|
|
- if(world.isBlockNormalCube(i - 1, j, k))
|
|
|
|
+ if(world.isBlockSolidOnSide(i - 1, j, k,5))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
- if(world.isBlockNormalCube(i + 1, j, k))
|
|
|
|
+ if(world.isBlockSolidOnSide(i + 1, j, k,4))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
- if(world.isBlockNormalCube(i, j, k - 1))
|
|
|
|
+ if(world.isBlockSolidOnSide(i, j, k - 1,3))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
- if(world.isBlockNormalCube(i, j, k + 1))
|
|
|
|
+ if(world.isBlockSolidOnSide(i, j, k + 1,2))
|
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
- return world.isBlockNormalCube(i, j - 1, k);
|
|
|
|
+ return world.isBlockSolidOnSide(i, j - 1, k,1);
|
|
|
|
}
|
|
|
|
|
|
|
|
public void onBlockPlaced(World world, int i, int j, int k, int l)
|
2011-11-30 19:00:43 +00:00
|
|
|
@@ -86,23 +86,23 @@
|
2011-10-09 04:21:29 +00:00
|
|
|
int j1 = i1 & 8;
|
|
|
|
i1 &= 7;
|
|
|
|
i1 = -1;
|
|
|
|
- if(l == 1 && world.isBlockNormalCube(i, j - 1, k))
|
|
|
|
+ if(l == 1 && world.isBlockSolidOnSide(i, j - 1, k,1))
|
|
|
|
{
|
|
|
|
i1 = 5 + world.rand.nextInt(2);
|
|
|
|
}
|
|
|
|
- if(l == 2 && world.isBlockNormalCube(i, j, k + 1))
|
|
|
|
+ if(l == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
|
|
|
|
{
|
|
|
|
i1 = 4;
|
|
|
|
}
|
|
|
|
- if(l == 3 && world.isBlockNormalCube(i, j, k - 1))
|
|
|
|
+ if(l == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
|
|
|
|
{
|
|
|
|
i1 = 3;
|
|
|
|
}
|
|
|
|
- if(l == 4 && world.isBlockNormalCube(i + 1, j, k))
|
|
|
|
+ if(l == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
|
|
|
|
{
|
|
|
|
i1 = 2;
|
|
|
|
}
|
|
|
|
- if(l == 5 && world.isBlockNormalCube(i - 1, j, k))
|
|
|
|
+ if(l == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
|
|
|
|
{
|
|
|
|
i1 = 1;
|
|
|
|
}
|
2011-11-30 19:00:43 +00:00
|
|
|
@@ -124,27 +124,27 @@
|
2011-10-09 04:21:29 +00:00
|
|
|
{
|
|
|
|
int i1 = world.getBlockMetadata(i, j, k) & 7;
|
|
|
|
boolean flag = false;
|
|
|
|
- if(!world.isBlockNormalCube(i - 1, j, k) && i1 == 1)
|
|
|
|
+ if(!world.isBlockSolidOnSide(i - 1, j, k,5) && i1 == 1)
|
|
|
|
{
|
|
|
|
flag = true;
|
|
|
|
}
|
|
|
|
- if(!world.isBlockNormalCube(i + 1, j, k) && i1 == 2)
|
|
|
|
+ if(!world.isBlockSolidOnSide(i + 1, j, k,4) && i1 == 2)
|
|
|
|
{
|
|
|
|
flag = true;
|
|
|
|
}
|
|
|
|
- if(!world.isBlockNormalCube(i, j, k - 1) && i1 == 3)
|
|
|
|
+ if(!world.isBlockSolidOnSide(i, j, k - 1,3) && i1 == 3)
|
|
|
|
{
|
|
|
|
flag = true;
|
|
|
|
}
|
|
|
|
- if(!world.isBlockNormalCube(i, j, k + 1) && i1 == 4)
|
|
|
|
+ if(!world.isBlockSolidOnSide(i, j, k + 1,2) && i1 == 4)
|
|
|
|
{
|
|
|
|
flag = true;
|
|
|
|
}
|
|
|
|
- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 5)
|
|
|
|
+ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 5)
|
|
|
|
{
|
|
|
|
flag = true;
|
|
|
|
}
|
|
|
|
- if(!world.isBlockNormalCube(i, j - 1, k) && i1 == 6)
|
|
|
|
+ if(!world.isBlockSolidOnSide(i, j - 1, k,1) && i1 == 6)
|
|
|
|
{
|
|
|
|
flag = true;
|
|
|
|
}
|