diff options
author | mbax <matt@phozop.net> | 2013-11-04 07:07:38 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-11-30 19:26:12 -0600 |
commit | 2726696652179a5ead7dc07dd39edf7dfda687f7 (patch) | |
tree | ff78e22fdd4fc01889a5f6cc482b599f965cd93a /src/main/java/net/minecraft/server/EntitySquid.java | |
parent | ff8b70fbb7a96b9d2ff078afcf3b3ff90f200981 (diff) | |
download | craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.gz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.lz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.xz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.zip |
Update CraftBukkit to Minecraft 1.7.2
Diffstat (limited to 'src/main/java/net/minecraft/server/EntitySquid.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntitySquid.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java index e238e658..bc6e1f4a 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -25,32 +25,32 @@ public class EntitySquid extends EntityWaterAnimal { this.by = 1.0F / (this.random.nextFloat() + 1.0F) * 0.2F; } - protected void az() { - super.az(); + protected void aD() { + super.aD(); this.getAttributeInstance(GenericAttributes.a).setValue(10.0D); } - protected String r() { + protected String t() { return null; } - protected String aO() { + protected String aT() { return null; } - protected String aP() { + protected String aU() { return null; } - protected float ba() { + protected float bf() { return 0.4F; } - protected int getLootId() { - return 0; + protected Item getLoot() { + return Item.d(0); } - protected boolean e_() { + protected boolean g_() { return false; } @@ -68,13 +68,13 @@ public class EntitySquid extends EntityWaterAnimal { } /* CraftBukkit start - Delegate to Entity to use existing inWater value - public boolean H() { + public boolean M() { return this.world.a(this.boundingBox.grow(0.0D, -0.6000000238418579D, 0.0D), Material.WATER, (Entity) this); } // CraftBukkit end */ - public void c() { - super.c(); + public void e() { + super.e(); this.bq = this.bp; this.bs = this.br; this.bu = this.bt; @@ -87,7 +87,7 @@ public class EntitySquid extends EntityWaterAnimal { } } - if (this.H()) { + if (this.M()) { float f; if (this.bt < 3.1415927F) { @@ -135,7 +135,7 @@ public class EntitySquid extends EntityWaterAnimal { this.move(this.motX, this.motY, this.motZ); } - protected void bl() { + protected void bq() { ++this.aV; if (this.aV > 100) { this.bA = this.bB = this.bC = 0.0F; @@ -147,7 +147,7 @@ public class EntitySquid extends EntityWaterAnimal { this.bC = MathHelper.sin(f) * 0.2F; } - this.u(); + this.w(); } public boolean canSpawn() { |