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

@@ -34,7 +34,7 @@ public final class SpawnerCreature {
public SpawnerCreature() {}
protected static ChunkPosition a(World world, int i, int j) {
protected static ChunkPosition getRandomPosition(World world, int i, int j) {
int k = i + world.random.nextInt(16);
int l = world.random.nextInt(world.height);
int i1 = j + world.random.nextInt(16);
@@ -92,7 +92,7 @@ public final class SpawnerCreature {
for (EntryBase base : b) {
ChunkEntry entry = (SpawnerCreature.ChunkEntry) base;
if (!entry.spawn) {
ChunkPosition chunkposition = a(world, entry.getX() * 16, entry.getZ() * 16);
ChunkPosition chunkposition = getRandomPosition(world, entry.getX() * 16, entry.getZ() * 16);
// CraftBukkit end
int k1 = chunkposition.x;
int l1 = chunkposition.y;
@@ -145,7 +145,7 @@ public final class SpawnerCreature {
}
entityliving.setPositionRotation((double) f, (double) f1, (double) f2, world.random.nextFloat() * 360.0F, 0.0F);
if (entityliving.g()) {
if (entityliving.canSpawn()) {
++j2;
// CraftBukkit - added a reason for spawning this creature
world.addEntity(entityliving, SpawnReason.NATURAL);