Update upstream CB/S

--- work/CraftBukkit
Submodule work/CraftBukkit d7bebeff0..acbc348e9:
  > SPIGOT-4477: Arrows only firing direction of boat
  > Improve zombie villagers

--- work/Spigot
Submodule work/Spigot dcd16439b..e8ded36bc:
  > Rebuild patches
  > Add PlayerConnection timings

10 files changed, 48 insertions, 59 deletions

diff --git a/Spigot-Server-Patches/0008-MC-Utils.patch b/Spigot-Server-Patches/0008-MC-Utils.patch
index 354aee9dc4..b34ec5852e 100644
--- a/Spigot-Server-Patches/0008-MC-Utils.patch
+++ b/Spigot-Server-Patches/0008-MC-Utils.patch
@@ -1,4 +1,4 @@
-From 314b0b3eeb050f45dc3e9ba4eb41acf52e24e80f Mon Sep 17 00:00:00 2001
+From 736cdf2368b8d0f95b7c643fa2766d9787378c10 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -354,7 +354,7 @@ index e0cb6aa6..bc638366 100644
  
      public NBTTagList() {}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 25dedb9d..c98dfd26 100644
+index 8c604ef8..8efcb831 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -65,9 +65,9 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -370,7 +370,7 @@ index 25dedb9d..c98dfd26 100644
      // CraftBukkit start - multithreaded fields
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
-@@ -2160,6 +2160,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2162,6 +2162,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
  
      }
  
@@ -379,5 +379,5 @@ index 25dedb9d..c98dfd26 100644
          return System.nanoTime() / 1000000L;
      }
 -- 
-2.19.1
+2.19.2
 
diff --git a/Spigot-Server-Patches/0009-Timings-v2.patch b/Spigot-Server-Patches/0009-Timings-v2.patch
index 44048cbedd..81216043db 100644
--- a/Spigot-Server-Patches/0009-Timings-v2.patch
+++ b/Spigot-Server-Patches/0009-Timings-v2.patch
@@ -1,4 +1,4 @@
-From 4434336cca0aea35c9261dd4abbc5679c8c6a7ca Mon Sep 17 00:00:00 2001
+From 5e253ec4989164677875afdb670324f72b6161bf Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -987,7 +987,7 @@ index eeac3499..e4ed2e99 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c98dfd26..4174fbfd 100644
+index 8efcb831..27a6d1e2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -998,7 +998,23 @@ index c98dfd26..4174fbfd 100644
  // CraftBukkit end
  
  public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-@@ -1380,7 +1381,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -135,7 +136,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+     // CraftBukkit end
+ 
+     public void e() {
+-        org.bukkit.craftbukkit.SpigotTimings.playerConnectionTimer.startTiming(); // Spigot
+         this.syncPosition();
+         this.player.playerTick();
+         this.player.setLocation(this.l, this.m, this.n, this.player.yaw, this.player.pitch);
+@@ -208,7 +208,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+             this.player.resetIdleTimer(); // CraftBukkit - SPIGOT-854
+             this.disconnect(new ChatMessage("multiplayer.disconnect.idling", new Object[0]));
+         }
+-        org.bukkit.craftbukkit.SpigotTimings.playerConnectionTimer.stopTiming(); // Spigot
+ 
+     }
+ 
+@@ -1382,7 +1381,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -1007,7 +1023,7 @@ index c98dfd26..4174fbfd 100644
         // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1391,22 +1392,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1393,22 +1392,22 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -1428,10 +1444,10 @@ index 14851a3a..9042deed 100644
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java b/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 deleted file mode 100644
-index 4c8ab2bc..00000000
+index 666d1eb9..00000000
 --- a/src/main/java/org/bukkit/craftbukkit/SpigotTimings.java
 +++ /dev/null
-@@ -1,174 +0,0 @@
+@@ -1,175 +0,0 @@
 -package org.bukkit.craftbukkit;
 -
 -import com.google.common.collect.Maps;
@@ -1451,6 +1467,7 @@ index 4c8ab2bc..00000000
 -    public static final CustomTimingsHandler playerListTimer = new CustomTimingsHandler("Player List");
 -    public static final CustomTimingsHandler commandFunctionsTimer = new CustomTimingsHandler("Command Functions");
 -    public static final CustomTimingsHandler connectionTimer = new CustomTimingsHandler("Connection Handler");
+-    public static final CustomTimingsHandler playerConnectionTimer = new CustomTimingsHandler("** PlayerConnection");
 -    public static final CustomTimingsHandler tickablesTimer = new CustomTimingsHandler("Tickables");
 -    public static final CustomTimingsHandler schedulerTimer = new CustomTimingsHandler("Scheduler");
 -    public static final CustomTimingsHandler chunkIOTickTimer = new CustomTimingsHandler("ChunkIOTick");
@@ -1909,5 +1926,5 @@ index 2bd690fd..38be7ed7 100644
      }
  }
 -- 
-2.19.1
+2.19.2
 
diff --git a/Spigot-Server-Patches/0368-Fix-server-icon-encoding-to-show-properly-on-1.13-cl.patch b/Spigot-Server-Patches/0367-Fix-server-icon-encoding-to-show-properly-on-1.13-cl.patch
index 2752544c77..e0cd0bbe8b 100644
--- a/Spigot-Server-Patches/0368-Fix-server-icon-encoding-to-show-properly-on-1.13-cl.patch
+++ b/Spigot-Server-Patches/0367-Fix-server-icon-encoding-to-show-properly-on-1.13-cl.patch
@@ -1,4 +1,4 @@
-From 4bca90c7e6140df3eedf5527f28d9081ea048508 Mon Sep 17 00:00:00 2001
+From 88f7737821901b4291d56f94b497b50068cda9d0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <[email protected]>
 Date: Mon, 5 Nov 2018 21:50:13 -0500
 Subject: [PATCH] Fix server icon encoding to show properly on 1.13 clients as
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix server icon encoding to show properly on 1.13 clients as
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e0546e3dd..3b982f990 100644
+index e0546e3d..3b982f99 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -735,7 +735,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@@ -19,7 +19,7 @@ index e0546e3dd..3b982f990 100644
                  MinecraftServer.LOGGER.error("Couldn\'t load server icon", exception);
              } finally {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9fe555986..7c82e18b9 100644
+index 9fe55598..7c82e18b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1778,7 +1778,7 @@ public final class CraftServer implements Server {
@@ -32,5 +32,5 @@ index 9fe555986..7c82e18b9 100644
  
      @Override
 -- 
-2.19.1
+2.19.2
 
diff --git a/Spigot-Server-Patches/0367-Keep-players-yaw-pitch-on-vehicle-updates.patch b/Spigot-Server-Patches/0367-Keep-players-yaw-pitch-on-vehicle-updates.patch
deleted file mode 100644
index fc6a018bfb..0000000000
--- a/Spigot-Server-Patches/0367-Keep-players-yaw-pitch-on-vehicle-updates.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 182ee0d285eaeedc1c500912fc51359878544406 Mon Sep 17 00:00:00 2001
-From: Aikar <[email protected]>
-Date: Fri, 2 Nov 2018 23:22:34 -0400
-Subject: [PATCH] Keep players yaw/pitch on vehicle updates
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 398f2fdf83..edd7ba353d 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -375,12 +375,12 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-                 Location curPos = this.getPlayer().getLocation(); // Spigot
- 
-                 entity.setLocation(d3, d4, d5, f, f1);
--                player.setLocation(d3, d4, d5, f, f1); // CraftBukkit
-+                player.setLocation(d3, d4, d5, player.yaw, player.pitch); // CraftBukkit // Paper
-                 boolean flag2 = worldserver.getCubes(entity, entity.getBoundingBox().shrink(0.0625D)).isEmpty();
- 
-                 if (flag && (flag1 || !flag2)) {
-                     entity.setLocation(d0, d1, d2, f, f1);
--                    player.setLocation(d0, d1, d2, f, f1); // CraftBukkit
-+                    player.setLocation(d3, d4, d5, player.yaw, player.pitch); // CraftBukkit // Paper
-                     this.networkManager.sendPacket(new PacketPlayOutVehicleMove(entity));
-                     return;
-                 }
--- 
-2.19.1
-
diff --git a/Spigot-Server-Patches/0369-Limit-Book-Sizes.patch b/Spigot-Server-Patches/0368-Limit-Book-Sizes.patch
index 8ec9027669..aebda329b4 100644
--- a/Spigot-Server-Patches/0369-Limit-Book-Sizes.patch
+++ b/Spigot-Server-Patches/0368-Limit-Book-Sizes.patch
@@ -1,11 +1,11 @@
-From b037f9c518d26ee6c566647b9df1d2ceed356fda Mon Sep 17 00:00:00 2001
+From a9f81124c623c9d1003357bb6c4c89ca834f3c2f Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Sat, 17 Nov 2018 00:08:54 -0500
 Subject: [PATCH] Limit Book Sizes
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 332e90f86b..0ac61f4de0 100644
+index 332e90f8..0ac61f4d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -320,4 +320,12 @@ public class PaperConfig {
@@ -22,7 +22,7 @@ index 332e90f86b..0ac61f4de0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index edd7ba353d..4c35132892 100644
+index d6d2010d..ea999b70 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2329,6 +2329,39 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -82,5 +82,5 @@ index edd7ba353d..4c35132892 100644
  
                          itemstack2.a("author", (NBTBase) (new NBTTagString(this.player.getName())));
 -- 
-2.19.1
+2.19.2
 
diff --git a/Spigot-Server-Patches/0370-Prevent-rayTrace-from-loading-chunks.patch b/Spigot-Server-Patches/0369-Prevent-rayTrace-from-loading-chunks.patch
index 74fbc08b90..9ea4fada3a 100644
--- a/Spigot-Server-Patches/0370-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0369-Prevent-rayTrace-from-loading-chunks.patch
@@ -1,4 +1,4 @@
-From b0f9bb4104252c176abf468b9563a0008409e688 Mon Sep 17 00:00:00 2001
+From a55fa31b0d23301861e55b4c70ebee7ad66c519d Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Mon, 26 Nov 2018 19:44:01 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
@@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7633a61342..bc231c7f29 100644
+index 7633a613..bc231c7f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -932,7 +932,8 @@ public abstract class World implements IBlockAccess {
@@ -31,5 +31,5 @@ index 7633a61342..bc231c7f29 100644
  
                      if (!flag1 || iblockdata1.getMaterial() == Material.PORTAL || iblockdata1.d(this, blockposition) != Block.k) {
 -- 
-2.19.1
+2.19.2
 
diff --git a/Spigot-Server-Patches/0371-Handle-Large-Packets-disconnecting-client.patch b/Spigot-Server-Patches/0370-Handle-Large-Packets-disconnecting-client.patch
index 4fe46ff061..3aa860fedd 100644
--- a/Spigot-Server-Patches/0371-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0370-Handle-Large-Packets-disconnecting-client.patch
@@ -1,4 +1,4 @@
-From 158c65a57917f6a0b3c27f5b67f834306e229194 Mon Sep 17 00:00:00 2001
+From 68670b9f2491fd93af0b802272f6d9f08ed75474 Mon Sep 17 00:00:00 2001
 From: Aikar <[email protected]>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 3d32e0056..a7fcc14f2 100644
+index 3d32e005..a7fcc14f 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -112,6 +112,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -27,7 +27,7 @@ index 3d32e0056..a7fcc14f2 100644
  
          if (throwable instanceof TimeoutException) {
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index fdc142b75..b283e1557 100644
+index fdc142b7..b283e155 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -8,5 +8,10 @@ public interface Packet<T extends PacketListener> {
@@ -42,7 +42,7 @@ index fdc142b75..b283e1557 100644
      void a(T t0);
  }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index a6da6f5cc..4e263aa8d 100644
+index a6da6f5c..4e263aa8 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -44,11 +44,32 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -80,7 +80,7 @@ index a6da6f5cc..4e263aa8d 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
-index bf47c8249..e054757d2 100644
+index bf47c824..e054757d 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet<PacketListenerPlayOut> {
@@ -100,5 +100,5 @@ index bf47c8249..e054757d2 100644
  
      public PacketPlayOutWindowItems(int i, NonNullList<ItemStack> nonnulllist) {
 -- 
-2.19.1
+2.19.2
 
diff --git a/Spigot-Server-Patches/0372-backport-SPIGOT-2719-Comparator-and-Observer-don-t-t.patch b/Spigot-Server-Patches/0371-backport-SPIGOT-2719-Comparator-and-Observer-don-t-t.patch
index e412e02214..f4e7d4fdfe 100644
--- a/Spigot-Server-Patches/0372-backport-SPIGOT-2719-Comparator-and-Observer-don-t-t.patch
+++ b/Spigot-Server-Patches/0371-backport-SPIGOT-2719-Comparator-and-Observer-don-t-t.patch
@@ -1,4 +1,4 @@
-From 778d563e5b2d8141a1df1c4b3fc074928f6552c2 Mon Sep 17 00:00:00 2001
+From ae78e5026972a2c6190432b90775db89adab66da Mon Sep 17 00:00:00 2001
 From: Amosar <[email protected]>
 Date: Sat, 1 Dec 2018 20:00:22 +0000
 Subject: [PATCH] backport: SPIGOT-2719: Comparator and Observer don't trigger
@@ -6,7 +6,7 @@ Subject: [PATCH] backport: SPIGOT-2719: Comparator and Observer don't trigger
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockObserver.java b/src/main/java/net/minecraft/server/BlockObserver.java
-index 59e93e6f6..5836a7637 100644
+index 59e93e6f..5836a763 100644
 --- a/src/main/java/net/minecraft/server/BlockObserver.java
 +++ b/src/main/java/net/minecraft/server/BlockObserver.java
 @@ -1,6 +1,7 @@
@@ -37,7 +37,7 @@ index 59e93e6f6..5836a7637 100644
              world.a(blockposition, (Block) this, 2);
          }
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneComparator.java b/src/main/java/net/minecraft/server/BlockRedstoneComparator.java
-index 78ad3374d..04d973d9a 100644
+index 78ad3374..04d973d9 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneComparator.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneComparator.java
 @@ -4,6 +4,7 @@ import com.google.common.base.Predicate;
diff --git a/work/CraftBukkit b/work/CraftBukkit
-Subproject d7bebeff028af7baf52105394529598f1c4093c
+Subproject acbc348e925cbdbae41b2055d60bbe40031d470
diff --git a/work/Spigot b/work/Spigot
-Subproject dcd16439b51429c18f1028bbe36ff805547050d
+Subproject e8ded36bc9c1661fc04f83762e3e0e94a273787