From a8a4bedd2a9ef3c192ecf76db9afaf0b784ed08d Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Thu, 9 Jun 2016 11:43:49 +1000
Subject: Update to Minecraft 1.10

---
 nms-patches/EntityTrackerEntry.patch | 42 ++++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

(limited to 'nms-patches/EntityTrackerEntry.patch')

diff --git a/nms-patches/EntityTrackerEntry.patch b/nms-patches/EntityTrackerEntry.patch
index 295003e6..db80f3e0 100644
--- a/nms-patches/EntityTrackerEntry.patch
+++ b/nms-patches/EntityTrackerEntry.patch
@@ -30,27 +30,27 @@
  
                  while (iterator.hasNext()) {
                      EntityHuman entityhuman = (EntityHuman) iterator.next();
-@@ -120,6 +126,19 @@
-                 boolean flag = k1 * k1 + l1 * l1 + i2 * i2 >= 128L || this.a % 60 == 0;
-                 boolean flag1 = Math.abs(i1 - this.yRot) >= 1 || Math.abs(j1 - this.xRot) >= 1;
+@@ -136,6 +142,19 @@
+                 boolean flag1 = l1 * l1 + i2 * i2 + j2 * j2 >= 128L || this.a % 60 == 0;
+                 boolean flag2 = Math.abs(j1 - this.yRot) >= 1 || Math.abs(k1 - this.xRot) >= 1;
  
 +                // CraftBukkit start - Code moved from below
-+                if (flag) {
-+                    this.xLoc = j;
-+                    this.yLoc = k;
-+                    this.zLoc = l;
++                if (flag1) {
++                    this.xLoc = k;
++                    this.yLoc = l;
++                    this.zLoc = i1;
 +                }
 +
-+                if (flag1) {
-+                    this.yRot = i1;
-+                    this.xRot = j1;
++                if (flag2) {
++                    this.yRot = j1;
++                    this.xRot = k1;
 +                }
 +                // CraftBukkit end
 +
                  if (this.a > 0 || this.tracker instanceof EntityArrow) {
-                     if (k1 >= -32768L && k1 < 32768L && l1 >= -32768L && l1 < 32768L && i2 >= -32768L && i2 < 32768L && this.v <= 400 && !this.x && this.y == this.tracker.onGround) {
-                         if ((!flag || !flag1) && !(this.tracker instanceof EntityArrow)) {
-@@ -134,6 +153,11 @@
+                     if (l1 >= -32768L && l1 < 32768L && i2 >= -32768L && i2 < 32768L && j2 >= -32768L && j2 < 32768L && this.v <= 400 && !this.x && this.y == this.tracker.onGround) {
+                         if ((!flag1 || !flag2) && !(this.tracker instanceof EntityArrow)) {
+@@ -150,6 +169,11 @@
                      } else {
                          this.y = this.tracker.onGround;
                          this.v = 0;
@@ -62,22 +62,22 @@
                          this.c();
                          object = new PacketPlayOutEntityTeleport(this.tracker);
                      }
-@@ -165,6 +189,7 @@
+@@ -181,6 +205,7 @@
                  }
  
                  this.d();
 +                /* CraftBukkit start - Code moved up
-                 if (flag) {
-                     this.xLoc = j;
-                     this.yLoc = k;
-@@ -175,6 +200,7 @@
-                     this.yRot = i1;
-                     this.xRot = j1;
+                 if (flag1) {
+                     this.xLoc = k;
+                     this.yLoc = l;
+@@ -191,6 +216,7 @@
+                     this.yRot = j1;
+                     this.xRot = k1;
                  }
 +                // CraftBukkit end */
  
                  this.x = false;
-             } else {
+             }
 @@ -206,7 +232,27 @@
  
          ++this.a;
-- 
cgit v1.2.3