summaryrefslogtreecommitdiffstats
path: root/nms-patches/EntitySquid.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/EntitySquid.patch')
-rw-r--r--nms-patches/EntitySquid.patch29
1 files changed, 3 insertions, 26 deletions
diff --git a/nms-patches/EntitySquid.patch b/nms-patches/EntitySquid.patch
index 01a76d9d..40128c83 100644
--- a/nms-patches/EntitySquid.patch
+++ b/nms-patches/EntitySquid.patch
@@ -1,14 +1,6 @@
---- ../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 @@
+--- /home/matt/mc-dev-private//net/minecraft/server/EntitySquid.java 2015-02-26 22:40:22.703608138 +0000
++++ src/main/java/net/minecraft/server/EntitySquid.java 2015-02-26 22:40:22.703608138 +0000
+@@ -67,9 +67,11 @@
}
@@ -20,18 +12,3 @@
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) {