Update upstream CB

11 files changed, 35 insertions, 87 deletions

diff --git a/Spigot-Server-Patches/0005-Timings-v2.patch b/Spigot-Server-Patches/0005-Timings-v2.patch
index aa0968db8f..ef7bd986b9 100644
--- a/Spigot-Server-Patches/0005-Timings-v2.patch
+++ b/Spigot-Server-Patches/0005-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 9b8b2dbd4c28d92465f6689dc33ffbe5465f8a80 Mon Sep 17 00:00:00 2001
+From cc65e1b66b14dc2f2ef8ee68689bdee6201c1fd0 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -969,7 +969,7 @@ index b0249ff..797a84f 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8f42ac8..0546cb8 100644
+index 29f0062..d910c41 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -57,6 +57,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -980,7 +980,7 @@ index 8f42ac8..0546cb8 100644
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-@@ -1341,7 +1342,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1339,7 +1340,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
     private void handleCommand(String s) {
@@ -989,7 +989,7 @@ index 8f42ac8..0546cb8 100644
         // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1352,22 +1353,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1350,22 +1351,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1017,7 +1017,7 @@ index 8f42ac8..0546cb8 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 6bd7151..1b2cc01 100644
+index 7090262..2e418a7 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
diff --git a/Spigot-Server-Patches/0053-Ensure-commands-are-not-ran-async.patch b/Spigot-Server-Patches/0053-Ensure-commands-are-not-ran-async.patch
index 1c56c236dd..7c04b0c2e9 100644
--- a/Spigot-Server-Patches/0053-Ensure-commands-are-not-ran-async.patch
+++ b/Spigot-Server-Patches/0053-Ensure-commands-are-not-ran-async.patch
@@ -1,4 +1,4 @@
-From c5da7db2be2f4c4b52919df2ba11639b0c8a4207 Mon Sep 17 00:00:00 2001
+From 9da75049cbc87364d2765429847b1b7dd298abc9 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0546cb8..de4df07 100644
+index d910c41..b2339e9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1274,6 +1274,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1272,6 +1272,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
diff --git a/Spigot-Server-Patches/0070-Complete-resource-pack-API.patch b/Spigot-Server-Patches/0070-Complete-resource-pack-API.patch
index 8081c2c4f6..2b244d56aa 100644
--- a/Spigot-Server-Patches/0070-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0070-Complete-resource-pack-API.patch
@@ -1,14 +1,14 @@
-From dab73f3d08c224355e576cb9f682661206ad3999 Mon Sep 17 00:00:00 2001
+From 7ad7edb70e7183fe0cf057c6ac2483f8a1d3e5fa Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index de4df07..5e58fe8 100644
+index b2339e9..5e9eca1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1035,7 +1035,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1033,7 +1033,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
diff --git a/Spigot-Server-Patches/0111-Add-PlayerUseUnknownEntityEvent.patch b/Spigot-Server-Patches/0111-Add-PlayerUseUnknownEntityEvent.patch
index 7ecab928b5..ec40ce1bdc 100644
--- a/Spigot-Server-Patches/0111-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0111-Add-PlayerUseUnknownEntityEvent.patch
@@ -1,4 +1,4 @@
-From 0fc2cae5ea62f9ada2cd85b0370610281ef9827a Mon Sep 17 00:00:00 2001
+From 333e27c742b38efc4bcecbd2617c4b85c188afab Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <[email protected]>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
@@ -18,10 +18,10 @@ index 2b23a5d..6464a84 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5e58fe8..eea7872 100644
+index 5e9eca1..f562373 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1624,6 +1624,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1622,6 +1622,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
diff --git a/Spigot-Server-Patches/0118-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch b/Spigot-Server-Patches/0118-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
index c407a58aa9..86d54fa89d 100644
--- a/Spigot-Server-Patches/0118-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0118-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@@ -1,4 +1,4 @@
-From e2f61166eff742d9581e4566bdce26ff7a05c4b9 Mon Sep 17 00:00:00 2001
+From eae31361f0bb0cdd478a0654fb10b034e4586117 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -31,10 +31,10 @@ index 7696998..966f9fd 100644
      public ScoreboardTeamBase aQ() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index eea7872..eb4af2e 100644
+index f562373..236062d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1354,7 +1354,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1352,7 +1352,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
diff --git a/Spigot-Server-Patches/0160-More-informative-vehicle-moved-wrongly-message.patch b/Spigot-Server-Patches/0160-More-informative-vehicle-moved-wrongly-message.patch
index c4a2f21eb2..6b8d29e65e 100644
--- a/Spigot-Server-Patches/0160-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0160-More-informative-vehicle-moved-wrongly-message.patch
@@ -1,14 +1,14 @@
-From 83bd048489dd3e6a1de7e6b6d224eb680f6aab00 Mon Sep 17 00:00:00 2001
+From 087e74ba75e93488140b390e5291d95f45c9843f Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index eb4af2e..5a55f86 100644
+index 236062d..04ca0f4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -345,7 +345,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -343,7 +343,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
                  if (d10 > org.spigotmc.SpigotConfig.movedWronglyThreshold) { // Spigot
                      flag1 = true;
diff --git a/Spigot-Server-Patches/0166-Fix-AIOOBE-in-inventory-handling.patch b/Spigot-Server-Patches/0166-Fix-AIOOBE-in-inventory-handling.patch
index 55f4465064..3cc2f08202 100644
--- a/Spigot-Server-Patches/0166-Fix-AIOOBE-in-inventory-handling.patch
+++ b/Spigot-Server-Patches/0166-Fix-AIOOBE-in-inventory-handling.patch
@@ -1,14 +1,14 @@
-From 8ecdc74dfc0ad8778129911d59a8489821ce3837 Mon Sep 17 00:00:00 2001
+From e0fe0796c36bbbe60e65f4fed48b674c1169701a Mon Sep 17 00:00:00 2001
 From: Brokkonaut <[email protected]>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5a55f86..18a455e 100644
+index 04ca0f4..5cbced0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1824,7 +1824,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1822,7 +1822,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.c() == 2) {
                              click = ClickType.MIDDLE;
diff --git a/Spigot-Server-Patches/0167-Configurable-packet-in-spam-threshold.patch b/Spigot-Server-Patches/0167-Configurable-packet-in-spam-threshold.patch
index bbf62277dd..b196f05e34 100644
--- a/Spigot-Server-Patches/0167-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0167-Configurable-packet-in-spam-threshold.patch
@@ -1,4 +1,4 @@
-From e013242e770933d8af0161f53d7d8e2455ebd55e Mon Sep 17 00:00:00 2001
+From 0e7be255474cb7e18c4eecdfd729cb55428bd0d7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
@@ -23,10 +23,10 @@ index 91546b6..211b88a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 18a455e..00b645e 100644
+index 5cbced0..d82eec9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -870,13 +870,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -868,13 +868,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
diff --git a/Spigot-Server-Patches/0168-Configurable-flying-kick-messages.patch b/Spigot-Server-Patches/0168-Configurable-flying-kick-messages.patch
index 7d72355f25..54ca5a0479 100644
--- a/Spigot-Server-Patches/0168-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0168-Configurable-flying-kick-messages.patch
@@ -1,4 +1,4 @@
-From 027de108d3cc8bad73b9076d300b9c8ad4ee4aa6 Mon Sep 17 00:00:00 2001
+From 310d95004ccabc847e481ad33d4c9cb8135464ca Mon Sep 17 00:00:00 2001
 From: kashike <[email protected]>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
@@ -21,10 +21,10 @@ index 211b88a..3161dad 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 00b645e..59f7020 100644
+index d82eec9..ef3a096 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -145,7 +145,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -143,7 +143,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          if (this.B) {
              if (++this.C > 80) {
                  PlayerConnection.LOGGER.warn("{} was kicked for floating too long!", new Object[] { this.player.getName()});
@@ -33,7 +33,7 @@ index 00b645e..59f7020 100644
                  return;
              }
          } else {
-@@ -164,7 +164,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -162,7 +162,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              if (this.D && this.player.getVehicle().bw() == this.player) {
                  if (++this.E > 80) {
                      PlayerConnection.LOGGER.warn("{} was kicked for floating a vehicle too long!", new Object[] { this.player.getName()});
diff --git a/Spigot-Server-Patches/0178-SPIGOT-1903-Use-alternate-fix.patch b/Spigot-Server-Patches/0178-SPIGOT-1903-Use-alternate-fix.patch
deleted file mode 100644
index 9d37692163..0000000000
--- a/Spigot-Server-Patches/0178-SPIGOT-1903-Use-alternate-fix.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 3f994a958bdda226403b9927b3f363e3373f8405 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-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 4039317..4446719 100644
---- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -307,6 +307,7 @@ 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 59f7020..870a4b5 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -135,9 +135,12 @@ 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;
-@@ -206,7 +209,7 @@ 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;
--- 
-2.9.3
-
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject fd8d8cf40485d868fc8005959c7f70cf05eb153
+Subproject 2e39de698d0998d4d5a2283686d192614505b7f