diff options
author | Erik Broes <erikbroes@grum.nl> | 2012-01-14 21:03:48 +0100 |
---|---|---|
committer | Erik Broes <erikbroes@grum.nl> | 2012-01-15 10:52:37 +0100 |
commit | 61ec751ca11f5bff9ec2dd1644982d5628270004 (patch) | |
tree | 8829269e1c5807b55566d367bec5ee630d5dfb1d /src/main/java/net/minecraft/server/EntitySquid.java | |
parent | 6495eee0c9fddcce2c2aa9bf9c45118abea180c1 (diff) | |
download | craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.gz craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.lz craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.tar.xz craftbukkit-61ec751ca11f5bff9ec2dd1644982d5628270004.zip |
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.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySquid.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntitySquid.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java index 71005f60..c8204d5a 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -54,7 +54,7 @@ public class EntitySquid extends EntityWaterAnimal { return 0.4F; } - protected int e() { + protected int getLootId() { return 0; } @@ -117,7 +117,7 @@ public class EntitySquid extends EntityWaterAnimal { this.motZ = (double) (this.q * this.l); } - f = MathHelper.a(this.motX * this.motX + this.motZ * this.motZ); + f = MathHelper.sqrt(this.motX * this.motX + this.motZ * this.motZ); this.V += (-((float) Math.atan2(this.motX, this.motZ)) * 180.0F / 3.1415927F - this.V) * 0.1F; this.yaw = this.V; this.c += 3.1415927F * this.n * 1.5F; @@ -154,7 +154,7 @@ public class EntitySquid extends EntityWaterAnimal { this.au(); } - public boolean g() { - return this.locY > 45.0D && this.locY < (double) this.world.seaLevel && super.g(); + public boolean canSpawn() { + return this.locY > 45.0D && this.locY < (double) this.world.seaLevel && super.canSpawn(); } } |