Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.5

Browse Source
This commit is contained in:
Travis Watkins
2013-03-13 17:33:27 -05:00
parent ba6e4c38cf
commit 83d29e461c
246 changed files with 8499 additions and 6759 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/net/minecraft/server/BlockStem.java
View File

@@ -6,10 +6,10 @@ import org.bukkit.craftbukkit.event.CraftEventFactory; // CraftBukkit
public class BlockStem extends BlockFlower {
private Block blockFruit;
private final Block blockFruit;
protected BlockStem(int i, Block block) {
super(i, 111);
super(i);
this.blockFruit = block;
this.b(true);
float f = 0.125F;
@@ -18,21 +18,20 @@ public class BlockStem extends BlockFlower {
this.a((CreativeModeTab) null);
}
protected boolean d_(int i) {
protected boolean f_(int i) {
return i == Block.SOIL.id;
}
public void b(World world, int i, int j, int k, Random random) {
super.b(world, i, j, k, random);
public void a(World world, int i, int j, int k, Random random) {
super.a(world, i, j, k, random);
if (world.getLightLevel(i, j + 1, k) >= 9) {
float f = this.n(world, i, j, k);
float f = this.m(world, i, j, k);
if (random.nextInt((int) (25.0F / f) + 1) == 0) {
int l = world.getData(i, j, k);
if (l < 7) {
++l;
CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this.id, l); // CraftBukkit
CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this.id, ++l); // CraftBukkit
} else {
if (world.getTypeId(i - 1, j, k) == this.blockFruit.id) {
return;
@@ -80,11 +79,17 @@ public class BlockStem extends BlockFlower {
}
}
public void l(World world, int i, int j, int k) {
world.setData(i, j, k, 7);
public void k(World world, int i, int j, int k) {
int l = world.getData(i, j, k) + MathHelper.nextInt(world.random, 2, 5);
if (l > 7) {
l = 7;
}
world.setData(i, j, k, l, 2);
}
private float n(World world, int i, int j, int k) {
private float m(World world, int i, int j, int k) {
float f = 1.0F;
int l = world.getTypeId(i, j, k - 1);
int i1 = world.getTypeId(i, j, k + 1);
@@ -125,11 +130,7 @@ public class BlockStem extends BlockFlower {
return f;
}
public int a(int i, int j) {
return this.textureId;
}
public void f() {
public void g() {
float f = 0.125F;
this.a(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.25F, 0.5F + f);