Update patch files and cb

2015-10-22 08:07:10 +13:00 · 2015-10-22 08:07:10 +13:00 · 3cd803cda0
commit 3cd803cda0
parent 5c010af8c4
3 changed files with 141 additions and 0 deletions
--- a/Patches/CraftBukkit-Patches/0167-Set-aK-field-on-LivingEntity-spawn-to-do-facing-dire.patch
+++ b/Patches/CraftBukkit-Patches/0167-Set-aK-field-on-LivingEntity-spawn-to-do-facing-dire.patch
@ -0,0 +1,24 @@
+From ff4ee42a168c7990c2d39e7a19adfc14496182bd Mon Sep 17 00:00:00 2001
+From: libraryaddict <libraryaddict115@yahoo.co.nz>
+Date: Thu, 22 Oct 2015 05:50:51 +1300
+Subject: [PATCH] Set aK field on LivingEntity spawn to do facing direction
+
+
+diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
+index ee19bd6..f940b45 100644
+--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
+@@ -1011,6 +1011,10 @@ public abstract class Entity implements ICommandListener {
+         this.lastZ = this.locZ = d2;
+         this.lastYaw = this.yaw = f;
+         this.lastPitch = this.pitch = f1;
+
+        if (this instanceof EntityLiving)
+            ((EntityLiving) this).aK = f;
+
+         double d3 = (double) (this.lastYaw - f);
+ 
+         if (d3 < -180.0D) {
+-- 
+1.9.5.msysgit.0
+
--- a/Patches/CraftBukkit-Patches/0168-Add-and-modify-ControllerLook-to-ignore-vegetated-en.patch
+++ b/Patches/CraftBukkit-Patches/0168-Add-and-modify-ControllerLook-to-ignore-vegetated-en.patch
@ -0,0 +1,117 @@
+From 9f0406a4f0cd0ed941f2e167f9badf6fc4d1ebcf Mon Sep 17 00:00:00 2001
+From: libraryaddict <libraryaddict115@yahoo.co.nz>
+Date: Thu, 22 Oct 2015 07:57:48 +1300
+Subject: [PATCH] Add and modify ControllerLook to ignore vegetated entities
+
+
+diff --git a/src/main/java/net/minecraft/server/ControllerLook.java b/src/main/java/net/minecraft/server/ControllerLook.java
+new file mode 100644
+index 0000000..2263d5d
+--- /dev/null
+++ b/src/main/java/net/minecraft/server/ControllerLook.java
+@@ -0,0 +1,101 @@
+package net.minecraft.server;
+
+public class ControllerLook
+{
+  private EntityInsentient a;
+  private float b;
+  private float c;
+  private boolean d;
+  private double e;
+  private double f;
+  private double g;
+
+  public ControllerLook(EntityInsentient paramEntityInsentient)
+  {
+    this.a = paramEntityInsentient;
+  }
+
+  public void a(Entity paramEntity, float paramFloat1, float paramFloat2) {
+    this.e = paramEntity.locX;
+    if ((paramEntity instanceof EntityLiving))
+      this.f = (paramEntity.locY + paramEntity.getHeadHeight());
+    else {
+      this.f = ((paramEntity.getBoundingBox().b + paramEntity.getBoundingBox().e) / 2.0D);
+    }
+    this.g = paramEntity.locZ;
+    this.b = paramFloat1;
+    this.c = paramFloat2;
+    this.d = true;
+  }
+
+  public void a(double paramDouble1, double paramDouble2, double paramDouble3, float paramFloat1, float paramFloat2) {
+    this.e = paramDouble1;
+    this.f = paramDouble2;
+    this.g = paramDouble3;
+    this.b = paramFloat1;
+    this.c = paramFloat2;
+    this.d = true;
+  }
+
+  public void a() {
+      if (a.isVegetated())
+          return;
+    this.a.pitch = 0.0F;
+
+    if (this.d) {
+      this.d = false;
+
+      double d1 = this.e - this.a.locX;
+      double d2 = this.f - (this.a.locY + this.a.getHeadHeight());
+      double d3 = this.g - this.a.locZ;
+      double d4 = MathHelper.sqrt(d1 * d1 + d3 * d3);
+
+      float f1 = (float)(MathHelper.b(d3, d1) * 180.0D / 3.141592741012573D) - 90.0F;
+      float f2 = (float)-(MathHelper.b(d2, d4) * 180.0D / 3.141592741012573D);
+      this.a.pitch = a(this.a.pitch, f2, this.c);
+      this.a.aK = a(this.a.aK, f1, this.b);
+    } else {
+      this.a.aK = a(this.a.aK, this.a.aI, 10.0F);
+    }
+
+    float f3 = MathHelper.g(this.a.aK - this.a.aI);
+
+    if (!this.a.getNavigation().m())
+    {
+      if (f3 < -75.0F) {
+       this.a.aK = (this.a.aI - 75.0F);
+      }
+      if (f3 > 75.0F)
+        this.a.aK = (this.a.aI + 75.0F);
+    }
+  }
+
+  private float a(float paramFloat1, float paramFloat2, float paramFloat3)
+  {
+    float f1 = MathHelper.g(paramFloat2 - paramFloat1);
+    if (f1 > paramFloat3) {
+      f1 = paramFloat3;
+    }
+    if (f1 < -paramFloat3) {
+      f1 = -paramFloat3;
+    }
+    return paramFloat1 + f1;
+  }
+
+  public boolean b() {
+    return this.d;
+  }
+
+  public double e()
+  {
+    return this.e;
+  }
+
+  public double f() {
+    return this.f;
+  }
+
+  public double g() {
+    return this.g;
+  }
+}
+\ No newline at end of file
+-- 
+1.9.5.msysgit.0
+
--- a/Plugins/Libraries/craftbukkit.jar
+++ b/Plugins/Libraries/craftbukkit.jar