From 5b6d46e4c8897989c5d78b3daee76297e88dfcad Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 23 Oct 2016 01:32:04 -0500
Subject: [PATCH] Update upstream CB

---
 .../SPIGOT-1903-Use-alternate-fix.patch       | 50 -------------------
 work/CraftBukkit                              |  2 +-
 2 files changed, 1 insertion(+), 51 deletions(-)
 delete mode 100644 Spigot-Server-Patches/SPIGOT-1903-Use-alternate-fix.patch

diff --git a/Spigot-Server-Patches/SPIGOT-1903-Use-alternate-fix.patch b/Spigot-Server-Patches/SPIGOT-1903-Use-alternate-fix.patch
deleted file mode 100644
index d25a9698eb..0000000000
--- a/Spigot-Server-Patches/SPIGOT-1903-Use-alternate-fix.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 22 Oct 2016 15:32:31 -0500
-Subject: [PATCH] SPIGOT-1903: Use alternate fix
-
-Prevents rubber banding and moved too quickly issues
-
-Removes Spigot's fix in favor of the one previously in Paper
-See GH-453 for rationale
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener {
-         this.locX = d0;
-         this.locY = d1;
-         this.locZ = d2;
-+        if (this instanceof EntityPlayer && ((EntityPlayer) this).playerConnection != null) ((EntityPlayer) this).playerConnection.captureCurrentPosition(); // Paper
-         float f = this.width / 2.0F;
-         float f1 = this.length;
- 
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-     // CraftBukkit end
- 
-     public void E_() {
-+        // Paper start - Unreverse the order of location update, GH-453
-+        this.d();
-         // CraftBukkit start - SPIGOT-1903: reverse order of location update
-         this.player.k_();
--        this.d();
-+        //this.d();
-+        // Paper end
-         // CraftBukkit end
-         this.player.setLocation(this.l, this.m, this.n, this.player.yaw, this.player.pitch);
-         ++this.e;
-@@ -0,0 +0,0 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
- 
-     }
- 
--    private void d() {
-+    public void captureCurrentPosition() { d(); } private void d() { // Paper - OBFHELPER
-         this.l = this.player.locX;
-         this.m = this.player.locY;
-         this.n = this.player.locZ;
---
\ No newline at end of file
diff --git a/work/CraftBukkit b/work/CraftBukkit
index fd8d8cf404..2e39de698d 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit fd8d8cf40485d868fc8005959c7f70cf05eb153c
+Subproject commit 2e39de698d0998d4d5a2283686d192614505b7fa