mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 11:59:25 +00:00
Both update patches scripts no longer remove svn entries. Added the forge_client\bin and forge_server\bin folders to the svn ignore.
85 lines
2.8 KiB
Diff
85 lines
2.8 KiB
Diff
--- ../src_base/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000
|
|
+++ ../src_work/minecraft_server/net/minecraft/src/BlockLadder.java 0000-00-00 00:00:00.000000000 -0000
|
|
@@ -40,6 +40,11 @@
|
|
return super.getCollisionBoundingBoxFromPool(world, i, j, k);
|
|
}
|
|
|
|
+ /* FORGE: Implemented base method, see Block.isLadder */
|
|
+ public boolean isLadder() {
|
|
+ return true;
|
|
+ }
|
|
+
|
|
public boolean isOpaqueCube()
|
|
{
|
|
return false;
|
|
@@ -52,37 +57,37 @@
|
|
|
|
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;
|
|
}
|
|
- return world.isBlockNormalCube(i, j, k + 1);
|
|
+ return world.isBlockSolidOnSide(i, j, k + 1,2);
|
|
}
|
|
|
|
public void onBlockPlaced(World world, int i, int j, int k, int l)
|
|
{
|
|
int i1 = world.getBlockMetadata(i, j, k);
|
|
- if((i1 == 0 || l == 2) && world.isBlockNormalCube(i, j, k + 1))
|
|
+ if((i1 == 0 || l == 2) && world.isBlockSolidOnSide(i, j, k + 1,2))
|
|
{
|
|
i1 = 2;
|
|
}
|
|
- if((i1 == 0 || l == 3) && world.isBlockNormalCube(i, j, k - 1))
|
|
+ if((i1 == 0 || l == 3) && world.isBlockSolidOnSide(i, j, k - 1,3))
|
|
{
|
|
i1 = 3;
|
|
}
|
|
- if((i1 == 0 || l == 4) && world.isBlockNormalCube(i + 1, j, k))
|
|
+ if((i1 == 0 || l == 4) && world.isBlockSolidOnSide(i + 1, j, k,4))
|
|
{
|
|
i1 = 4;
|
|
}
|
|
- if((i1 == 0 || l == 5) && world.isBlockNormalCube(i - 1, j, k))
|
|
+ if((i1 == 0 || l == 5) && world.isBlockSolidOnSide(i - 1, j, k,5))
|
|
{
|
|
i1 = 5;
|
|
}
|
|
@@ -93,19 +98,19 @@
|
|
{
|
|
int i1 = world.getBlockMetadata(i, j, k);
|
|
boolean flag = false;
|
|
- if(i1 == 2 && world.isBlockNormalCube(i, j, k + 1))
|
|
+ if(i1 == 2 && world.isBlockSolidOnSide(i, j, k + 1,2))
|
|
{
|
|
flag = true;
|
|
}
|
|
- if(i1 == 3 && world.isBlockNormalCube(i, j, k - 1))
|
|
+ if(i1 == 3 && world.isBlockSolidOnSide(i, j, k - 1,3))
|
|
{
|
|
flag = true;
|
|
}
|
|
- if(i1 == 4 && world.isBlockNormalCube(i + 1, j, k))
|
|
+ if(i1 == 4 && world.isBlockSolidOnSide(i + 1, j, k,4))
|
|
{
|
|
flag = true;
|
|
}
|
|
- if(i1 == 5 && world.isBlockNormalCube(i - 1, j, k))
|
|
+ if(i1 == 5 && world.isBlockSolidOnSide(i - 1, j, k,5))
|
|
{
|
|
flag = true;
|
|
}
|