Update for 1.1_01 renames.

We know these updates (can) break plugins bypassing Bukkit. They are needed for
smooth updates however. There will be another one right before before 1.1-R1.
This commit is contained in:
Erik Broes
2012-01-14 21:03:48 +01:00
parent 6495eee0c9
commit 61ec751ca1
85 changed files with 466 additions and 456 deletions

View File

@@ -91,7 +91,7 @@ public class WorldGenTrees extends WorldGenerator {
if ((Math.abs(j2) != k1 || Math.abs(l2) != k1 || random.nextInt(2) != 0 && j1 != 0) && !Block.o[world.getTypeId(l1, i2, k2)]) {
// CraftBukkit start
if (event == null) {
this.a(world, l1, i2, k2, Block.LEAVES.id, 0);
this.setTypeAndData(world, l1, i2, k2, Block.LEAVES.id, 0);
} else {
BlockState leavesState = bukkitWorld.getBlockAt(l1, i2, k2).getState();
leavesState.setTypeId(Block.LEAVES.id);
@@ -108,7 +108,7 @@ public class WorldGenTrees extends WorldGenerator {
if (j1 == 0 || j1 == Block.LEAVES.id) {
// CraftBukkit start
if (event == null) {
this.a(world, i, j + i2, k, Block.LOG.id, 0);
this.setTypeAndData(world, i, j + i2, k, Block.LOG.id, 0);
} else {
BlockState logState = bukkitWorld.getBlockAt(i, j + i2, k).getState();
logState.setTypeId(Block.LOG.id);