keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Merge pull request #915 from Adubbz/master

Browse source 
Made canBeReplacedByLeaves default to whether a block isn't opaque rathe...
This commit is contained in:
LexManos 2014-01-03 16:14:37 -08:00
commit bb756115fa
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
patches/minecraft/net/minecraft/block/Block.java.patch
View file

@ -688,7 +688,7 @@
+ */ + */
+ public boolean canBeReplacedByLeaves(IBlockAccess world, int x, int y, int z) + public boolean canBeReplacedByLeaves(IBlockAccess world, int x, int y, int z)
+ { + {
+ return func_149730_j(); + return !func_149730_j();
+ } + }
+ +
+ /** + /**

2
patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.java.patch
View file

@ -14,7 +14,7 @@
} }
- if ((j2 != 0 || par4 >= par4 + i1 - 1) && !par1World.func_147439_a(l2, k1, i2).func_149730_j()) - if ((j2 != 0 || par4 >= par4 + i1 - 1) && !par1World.func_147439_a(l2, k1, i2).func_149730_j())
+ if ((j2 != 0 || par4 >= par4 + i1 - 1) && !par1World.func_147439_a(l2, k1, i2).canBeReplacedByLeaves(par1World, l2, k1, i2)) + if ((j2 != 0 || par4 >= par4 + i1 - 1) && par1World.func_147439_a(l2, k1, i2).canBeReplacedByLeaves(par1World, l2, k1, i2))
{ {
this.func_150516_a(par1World, l2, k1, i2, Block.func_149729_e(Block.func_149682_b(Blocks.brown_mushroom_block) + l), j2); this.func_150516_a(par1World, l2, k1, i2, Block.func_149729_e(Block.func_149682_b(Blocks.brown_mushroom_block) + l), j2);
} }

2
patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.java.patch
View file

@ -39,7 +39,7 @@
int j2 = i2 - par5; int j2 = i2 - par5;
- if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || par2Random.nextInt(2) != 0 && j1 != 0) && !par1World.func_147439_a(l2, k2, i2).func_149730_j()) - if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || par2Random.nextInt(2) != 0 && j1 != 0) && !par1World.func_147439_a(l2, k2, i2).func_149730_j())
+ if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || par2Random.nextInt(2) != 0 && j1 != 0) && !par1World.func_147439_a(l2, k2, i2).canBeReplacedByLeaves(par1World, l2, k2, i2)) + if ((Math.abs(l1) != k1 || Math.abs(j2) != k1 || par2Random.nextInt(2) != 0 && j1 != 0) && par1World.func_147439_a(l2, k2, i2).canBeReplacedByLeaves(par1World, l2, k2, i2))
{ {
this.func_150515_a(par1World, l2, k2, i2, Blocks.leaves); this.func_150515_a(par1World, l2, k2, i2, Blocks.leaves);
} }

2
patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.java.patch
View file

@ -39,7 +39,7 @@
int l2 = k2 - par5; int l2 = k2 - par5;
- if ((Math.abs(j3) != i3 || Math.abs(l2) != i3 || i3 <= 0) && !par1World.func_147439_a(j2, i2, k2).func_149730_j()) - if ((Math.abs(j3) != i3 || Math.abs(l2) != i3 || i3 <= 0) && !par1World.func_147439_a(j2, i2, k2).func_149730_j())
+ if ((Math.abs(j3) != i3 || Math.abs(l2) != i3 || i3 <= 0) && !par1World.func_147439_a(j2, i2, k2).canBeReplacedByLeaves(par1World, j2, i2, k2)) + if ((Math.abs(j3) != i3 || Math.abs(l2) != i3 || i3 <= 0) && par1World.func_147439_a(j2, i2, k2).canBeReplacedByLeaves(par1World, j2, i2, k2))
{ {
this.func_150516_a(par1World, j2, i2, k2, Blocks.leaves, 1); this.func_150516_a(par1World, j2, i2, k2, Blocks.leaves, 1);
} }

2
patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.java.patch
View file

@ -39,7 +39,7 @@
int k3 = j3 - par5; int k3 = j3 - par5;
- if ((Math.abs(i3) != l3 || Math.abs(k3) != l3 || l3 <= 0) && !par1World.func_147439_a(l2, k2, j3).func_149730_j()) - if ((Math.abs(i3) != l3 || Math.abs(k3) != l3 || l3 <= 0) && !par1World.func_147439_a(l2, k2, j3).func_149730_j())
+ if ((Math.abs(i3) != l3 || Math.abs(k3) != l3 || l3 <= 0) && !par1World.func_147439_a(l2, k2, j3).canBeReplacedByLeaves(par1World, l2, k2, j3)) + if ((Math.abs(i3) != l3 || Math.abs(k3) != l3 || l3 <= 0) && par1World.func_147439_a(l2, k2, j3).canBeReplacedByLeaves(par1World, l2, k2, j3))
{ {
this.func_150516_a(par1World, l2, k2, j3, Blocks.leaves, 1); this.func_150516_a(par1World, l2, k2, j3, Blocks.leaves, 1);
} }