Update CraftBukkit to Minecraft 1.4(.2).

This commit is contained in:
Travis Watkins
2012-10-24 22:53:23 -05:00
committed by EvilSeph
parent b9a72531b6
commit 60819c6693
237 changed files with 10104 additions and 4863 deletions

View File

@@ -38,16 +38,16 @@ public class BlockOre extends Block {
int j1 = 0;
if (this.id == Block.COAL_ORE.id) {
j1 = MathHelper.a(world.random, 0, 2);
j1 = MathHelper.nextInt(world.random, 0, 2);
} else if (this.id == Block.DIAMOND_ORE.id) {
j1 = MathHelper.a(world.random, 3, 7);
j1 = MathHelper.nextInt(world.random, 3, 7);
} else if (this.id == Block.EMERALD_ORE.id) {
j1 = MathHelper.a(world.random, 3, 7);
j1 = MathHelper.nextInt(world.random, 3, 7);
} else if (this.id == Block.LAPIS_ORE.id) {
j1 = MathHelper.a(world.random, 2, 5);
j1 = MathHelper.nextInt(world.random, 2, 5);
}
this.g(world, i, j, k, j1);
this.f(world, i, j, k, j1);
} */
}
@@ -56,13 +56,13 @@ public class BlockOre extends Block {
int j1 = 0;
if (this.id == Block.COAL_ORE.id) {
j1 = MathHelper.a(world.random, 0, 2);
j1 = MathHelper.nextInt(world.random, 0, 2);
} else if (this.id == Block.DIAMOND_ORE.id) {
j1 = MathHelper.a(world.random, 3, 7);
j1 = MathHelper.nextInt(world.random, 3, 7);
} else if (this.id == Block.EMERALD_ORE.id) {
j1 = MathHelper.a(world.random, 3, 7);
j1 = MathHelper.nextInt(world.random, 3, 7);
} else if (this.id == Block.LAPIS_ORE.id) {
j1 = MathHelper.a(world.random, 2, 5);
j1 = MathHelper.nextInt(world.random, 2, 5);
}
return j1;
@@ -72,7 +72,7 @@ public class BlockOre extends Block {
// CraftBukkit end
}
protected int getDropData(int i) {
public int getDropData(int i) {
return this.id == Block.LAPIS_ORE.id ? 4 : 0;
}
}