Updated to rename revision 02

This commit is contained in:
Erik Broes
2012-02-29 22:31:04 +01:00
committed by Nathan Adams
parent 8524ff8ef7
commit 33ba9f0a2f
100 changed files with 772 additions and 761 deletions

View File

@@ -4,11 +4,11 @@ import java.util.Random;
public class BlockStem extends BlockFlower {
private Block a;
private Block blockFruit;
protected BlockStem(int i, Block block) {
super(i, 111);
this.a = block;
this.blockFruit = block;
this.a(true);
float f = 0.125F;
@@ -28,21 +28,22 @@ public class BlockStem extends BlockFlower {
int l = world.getData(i, j, k);
if (l < 7) {
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this.id, ++l); // CraftBukkit
++l;
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, i, j, k, this.id, l); // CraftBukkit
} else {
if (world.getTypeId(i - 1, j, k) == this.a.id) {
if (world.getTypeId(i - 1, j, k) == this.blockFruit.id) {
return;
}
if (world.getTypeId(i + 1, j, k) == this.a.id) {
if (world.getTypeId(i + 1, j, k) == this.blockFruit.id) {
return;
}
if (world.getTypeId(i, j, k - 1) == this.a.id) {
if (world.getTypeId(i, j, k - 1) == this.blockFruit.id) {
return;
}
if (world.getTypeId(i, j, k + 1) == this.a.id) {
if (world.getTypeId(i, j, k + 1) == this.blockFruit.id) {
return;
}
@@ -69,7 +70,7 @@ public class BlockStem extends BlockFlower {
int l1 = world.getTypeId(j1, j - 1, k1);
if (world.getTypeId(j1, j, k1) == 0 && (l1 == Block.SOIL.id || l1 == Block.DIRT.id || l1 == Block.GRASS.id)) {
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, j1, j, k1, this.a.id, 0); // CraftBukkit
org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockGrowEvent(world, j1, j, k1, this.blockFruit.id, 0); // CraftBukkit
}
}
}
@@ -147,11 +148,11 @@ public class BlockStem extends BlockFlower {
if (!world.isStatic) {
Item item = null;
if (this.a == Block.PUMPKIN) {
if (this.blockFruit == Block.PUMPKIN) {
item = Item.PUMPKIN_SEEDS;
}
if (this.a == Block.MELON) {
if (this.blockFruit == Block.MELON) {
item = Item.MELON_SEEDS;
}