mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-22 13:09:59 +00:00
MinecraftForge/FML@9565529baf Updated to latest MCP and Minecraft 1.5.1 Pre-release. MinecraftForge/FML@a573faf92d Someone derped up this function bad, revert name.
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
--- ../src_base/minecraft/net/minecraft/block/BlockLog.java
|
|
+++ ../src_work/minecraft/net/minecraft/block/BlockLog.java
|
|
@@ -69,14 +69,9 @@
|
|
{
|
|
int j2 = par1World.getBlockId(par2 + k1, par3 + l1, par4 + i2);
|
|
|
|
- if (j2 == Block.leaves.blockID)
|
|
+ if (Block.blocksList[j2] != null)
|
|
{
|
|
- int k2 = par1World.getBlockMetadata(par2 + k1, par3 + l1, par4 + i2);
|
|
-
|
|
- if ((k2 & 8) == 0)
|
|
- {
|
|
- par1World.setBlockMetadataWithNotify(par2 + k1, par3 + l1, par4 + i2, k2 | 8, 4);
|
|
- }
|
|
+ Block.blocksList[j2].beginLeavesDecay(par1World, par2 + k1, par3 + l1, par4 + i2);
|
|
}
|
|
}
|
|
}
|
|
@@ -176,4 +171,16 @@
|
|
this.iconArray[i] = par1IconRegister.registerIcon(treeTextureTypes[i]);
|
|
}
|
|
}
|
|
+
|
|
+ @Override
|
|
+ public boolean canSustainLeaves(World world, int x, int y, int z)
|
|
+ {
|
|
+ return true;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public boolean isWood(World world, int x, int y, int z)
|
|
+ {
|
|
+ return true;
|
|
+ }
|
|
}
|