Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/

1 files changed, 37 insertions, 0 deletions

diff --git a/nms-patches/EntitySquid.patch b/nms-patches/EntitySquid.patch
new file mode 100644
index 00000000..83d481ae
--- /dev/null
+++ b/nms-patches/EntitySquid.patch
@@ -0,0 +1,37 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/EntitySquid.java	2014-11-27 08:59:46.733421706 +1100
++++ src/main/java/net/minecraft/server/EntitySquid.java	2014-11-27 08:42:10.156850903 +1100
+@@ -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) {