Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.4.4.

Browse Source
This commit is contained in:
Travis Watkins
2012-11-06 06:05:28 -06:00
parent a0c3b4f9d1
commit 7f7192f8fd
169 changed files with 3295 additions and 2774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/net/minecraft/server/SpawnerCreature.java
View File

@@ -21,7 +21,7 @@ public final class SpawnerCreature {
Chunk chunk = world.getChunkAt(i, j);
int k = i * 16 + world.random.nextInt(16);
int l = j * 16 + world.random.nextInt(16);
int i1 = world.random.nextInt(chunk == null ? world.O() : chunk.h() + 16 - 1);
int i1 = world.random.nextInt(chunk == null ? world.P() : chunk.h() + 16 - 1);
return new ChunkPosition(k, i1, l);
}
@@ -105,7 +105,7 @@ public final class SpawnerCreature {
int l1 = chunkposition.y;
int i2 = chunkposition.z;
if (!worldserver.s(k1, l1, i2) && worldserver.getMaterial(k1, l1, i2) == enumcreaturetype.c()) {
if (!worldserver.t(k1, l1, i2) && worldserver.getMaterial(k1, l1, i2) == enumcreaturetype.c()) {
int j2 = 0;
int k2 = 0;
@@ -157,7 +157,7 @@ public final class SpawnerCreature {
// CraftBukkit - added a reason for spawning this creature
worldserver.addEntity(entityliving, SpawnReason.NATURAL);
a(entityliving, worldserver, f, f1, f2);
if (j2 >= entityliving.bs()) {
if (j2 >= entityliving.bv()) {
continue label110;
}
}
@@ -188,19 +188,19 @@ public final class SpawnerCreature {
public static boolean a(EnumCreatureType enumcreaturetype, World world, int i, int j, int k) {
if (enumcreaturetype.c() == Material.WATER) {
return world.getMaterial(i, j, k).isLiquid() && !world.s(i, j + 1, k);
} else if (!world.t(i, j - 1, k)) {
return world.getMaterial(i, j, k).isLiquid() && world.getMaterial(i, j - 1, k).isLiquid() && !world.t(i, j + 1, k);
} else if (!world.v(i, j - 1, k)) {
return false;
} else {
int l = world.getTypeId(i, j - 1, k);
return l != Block.BEDROCK.id && !world.s(i, j, k) && !world.getMaterial(i, j, k).isLiquid() && !world.s(i, j + 1, k);
return l != Block.BEDROCK.id && !world.t(i, j, k) && !world.getMaterial(i, j, k).isLiquid() && !world.t(i, j + 1, k);
}
}
private static void a(EntityLiving entityliving, World world, float f, float f1, float f2) {
if (entityliving.dead) return; // CraftBukkit
entityliving.bD();
entityliving.bG();
}
public static void a(World world, BiomeBase biomebase, int i, int j, int k, int l, Random random) {