diff options
author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-22 20:39:39 +0000 |
---|---|---|
committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-22 20:39:39 +0000 |
commit | 9d09e7d0167326d4169f734e4b6d04c54d767507 (patch) | |
tree | 898333912891b9c35a63994242fbd55d5b6ac2c6 /src/main/java/net/minecraft/server/EntitySlime.java | |
parent | 8dc7417a3d5c1af1e6434dc54952cfd5a8e90688 (diff) | |
download | craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.gz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.lz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.tar.xz craftbukkit-9d09e7d0167326d4169f734e4b6d04c54d767507.zip |
Updated to Minecraft version 1.2.4. Updated version string to 1.2.4-R0.1.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySlime.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntitySlime.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java index 939edc4b..23e16d4f 100644 --- a/src/main/java/net/minecraft/server/EntitySlime.java +++ b/src/main/java/net/minecraft/server/EntitySlime.java @@ -15,7 +15,6 @@ public class EntitySlime extends EntityLiving implements IMonster { this.height = 0.0F; this.jumpDelay = this.random.nextInt(20) + 10; this.setSize(i); - this.aA = i; } protected void b() { @@ -28,6 +27,7 @@ public class EntitySlime extends EntityLiving implements IMonster { this.b(0.6F * (float) i, 0.6F * (float) i); this.setPosition(this.locX, this.locY, this.locZ); this.setHealth(this.getMaxHealth()); + this.aA = i; } public int getMaxHealth() { @@ -54,11 +54,11 @@ public class EntitySlime extends EntityLiving implements IMonster { return "slime"; } - protected String J() { + protected String I() { return "mob.slime"; } - public void G_() { + public void F_() { if (!this.world.isStatic && this.world.difficulty == 0 && this.getSize() > 0) { this.dead = true; } @@ -67,7 +67,7 @@ public class EntitySlime extends EntityLiving implements IMonster { this.c = this.b; boolean flag = this.onGround; - super.G_(); + super.F_(); if (this.onGround && !flag) { int i = this.getSize(); @@ -81,7 +81,7 @@ public class EntitySlime extends EntityLiving implements IMonster { } if (this.K()) { - this.world.makeSound(this, this.J(), this.p(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) / 0.8F); + this.world.makeSound(this, this.I(), this.p(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) / 0.8F); } this.a = -0.5F; @@ -91,7 +91,7 @@ public class EntitySlime extends EntityLiving implements IMonster { } protected void d_() { - this.aF(); + this.aG(); EntityHuman entityhuman = this.world.findNearbyVulnerablePlayer(this, 16.0D); // CraftBukkit TODO: EntityTargetEvent if (entityhuman != null) { @@ -106,7 +106,7 @@ public class EntitySlime extends EntityLiving implements IMonster { this.aZ = true; if (this.M()) { - this.world.makeSound(this, this.J(), this.p(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) * 0.8F); + this.world.makeSound(this, this.I(), this.p(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) * 0.8F); } this.a = 1.0F; @@ -128,7 +128,7 @@ public class EntitySlime extends EntityLiving implements IMonster { return this.random.nextInt(20) + 10; } - protected EntitySlime D() { + protected EntitySlime C() { return new EntitySlime(this.world); } @@ -153,7 +153,7 @@ public class EntitySlime extends EntityLiving implements IMonster { for (int k = 0; k < j; ++k) { float f = ((float) (k % 2) - 0.5F) * (float) i / 4.0F; float f1 = ((float) (k / 2) - 0.5F) * (float) i / 4.0F; - EntitySlime entityslime = this.D(); + EntitySlime entityslime = this.C(); entityslime.setSize(i / 2); entityslime.setPositionRotation(this.locX + (double) f, this.locY + 0.5D, this.locZ + (double) f1, this.random.nextFloat() * 360.0F, 0.0F); @@ -204,7 +204,7 @@ public class EntitySlime extends EntityLiving implements IMonster { return 0.4F * (float) this.getSize(); } - public int C() { + public int D() { return 0; } |