Update to Minecraft 1.7

src/main/java/net/minecraft/server/EntitySquid.java

@@ -54,7 +54,7 @@ public class EntitySquid extends EntityWaterAnimal {
         return 0;
     }
 
-    protected void r() {
+    protected void q() {
         // CraftBukkit start - whole method
         java.util.List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>();
 
@@ -79,12 +79,12 @@ public class EntitySquid extends EntityWaterAnimal {
         return false;
     }
 
-    public boolean ac() {
+    public boolean ad() {
         return this.world.a(this.boundingBox.b(0.0D, -0.6000000238418579D, 0.0D), Material.WATER, this);
     }
 
-    public void u() {
-        super.u();
+    public void v() {
+        super.v();
         this.b = this.a;
         this.f = this.c;
         this.h = this.g;
@@ -97,7 +97,7 @@ public class EntitySquid extends EntityWaterAnimal {
             }
         }
 
-        if (this.ac()) {
+        if (this.ad()) {
             float f;
 
             if (this.g < 3.1415927F) {
@@ -151,5 +151,7 @@ public class EntitySquid extends EntityWaterAnimal {
             this.o = -0.1F + this.random.nextFloat() * 0.2F;
             this.p = MathHelper.sin(f) * 0.2F;
         }
+
+        this.U();
     }
 }