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

@@ -28,7 +28,7 @@ public class VillageSiege {
return;
}
} else {
if (this.world.s()) {
if (this.world.t()) {
this.c = 0;
return;
}
@@ -139,12 +139,14 @@ public class VillageSiege {
try {
entityzombie = new EntityZombie(this.world);
entityzombie.bD();
entityzombie.setVillager(false);
} catch (Exception exception) {
exception.printStackTrace();
return false;
}
entityzombie.setPositionRotation(vec3d.a, vec3d.b, vec3d.c, this.world.random.nextFloat() * 360.0F, 0.0F);
entityzombie.setPositionRotation(vec3d.c, vec3d.d, vec3d.e, this.world.random.nextFloat() * 360.0F, 0.0F);
this.world.addEntity(entityzombie, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.VILLAGE_INVASION); // CraftBukkit
ChunkCoordinates chunkcoordinates = this.f.getCenter();
@@ -160,7 +162,7 @@ public class VillageSiege {
int k1 = k + this.world.random.nextInt(16) - 8;
if (this.f.a(i1, j1, k1) && SpawnerCreature.a(EnumCreatureType.MONSTER, this.world, i1, j1, k1)) {
return Vec3D.a().create((double) i1, (double) j1, (double) k1);
return this.world.getVec3DPool().create((double) i1, (double) j1, (double) k1);
}
}