--- ../work/decompile-8eb82bde//net/minecraft/server/EntitySquid.java	2014-11-28 17:43:43.165707433 +0000
+++ src/main/java/net/minecraft/server/EntitySquid.java	2014-11-28 17:38:18.000000000 +0000
@@ -1,5 +1,7 @@
 package net.minecraft.server;
 
+import org.bukkit.craftbukkit.TrigMath; // CraftBukkit
+
 public class EntitySquid extends EntityWaterAnimal {
 
     public float a;
@@ -67,9 +69,11 @@
 
     }
 
+    /* CraftBukkit start - Delegate to Entity to use existing inWater value
     public boolean V() {
         return this.world.a(this.getBoundingBox().grow(0.0D, -0.6000000238418579D, 0.0D), Material.WATER, (Entity) this);
     }
+    // CraftBukkit end */
 
     public void m() {
         super.m();
@@ -116,10 +120,12 @@
             }
 
             f = MathHelper.sqrt(this.motX * this.motX + this.motZ * this.motZ);
-            this.aG += (-((float) Math.atan2(this.motX, this.motZ)) * 180.0F / 3.1415927F - this.aG) * 0.1F;
+            // CraftBukkit - Math -> TrigMath
+            this.aG += (-((float) TrigMath.atan2(this.motX, this.motZ)) * 180.0F / 3.1415927F - this.aG) * 0.1F;
             this.yaw = this.aG;
             this.c = (float) ((double) this.c + 3.141592653589793D * (double) this.bp * 1.5D);
-            this.a += (-((float) Math.atan2((double) f, this.motY)) * 180.0F / 3.1415927F - this.a) * 0.1F;
+            // CraftBukkit - Math -> TrigMath
+            this.a += (-((float) TrigMath.atan2((double) f, this.motY)) * 180.0F / 3.1415927F - this.a) * 0.1F;
         } else {
             this.bl = MathHelper.e(MathHelper.sin(this.bj)) * 3.1415927F * 0.25F;
             if (!this.world.isStatic) {