Update upstream tacos B/CB/S

Spigot-Server-Patches/0005-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 71902c748944e74f9f67d964777dcfe04b3459fa Mon Sep 17 00:00:00 2001
+From d0fe49663f02efb35694b14bc4e0e6983bdf406c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -1180,7 +1180,7 @@ index 41d2d87..0000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ffc25bc..8cb9a7b 100644
+index d61065c..d6cf997 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -37,15 +37,9 @@ import org.bukkit.configuration.serialization.DelegateDeserialization;
@@ -1200,7 +1200,7 @@ index ffc25bc..8cb9a7b 100644
  import org.bukkit.craftbukkit.map.CraftMapView;
  import org.bukkit.craftbukkit.map.RenderData;
  import org.bukkit.craftbukkit.scoreboard.CraftScoreboard;
-@@ -1560,6 +1554,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1564,6 +1558,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
@@ -1411,5 +1411,5 @@ index 30efc99..eb30abe 100644
      }
  }
 -- 
-2.9.0
+2.9.0.windows.1
 

Spigot-Server-Patches/0019-Player-affects-spawning-API.patch

@@ -1,4 +1,4 @@
-From cb277aeafc3eac2cdb54872da1789d705f8dbcf3 Mon Sep 17 00:00:00 2001
+From 64b8c63495187ad509ed8e98ee642f76548e68e0 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
@@ -184,10 +184,10 @@ index 3e79e02..e3d971c 100644
                  double d4 = entityhuman.e(d0, d1, d2);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6b3bbfe..11e3028 100644
+index d6cf997..f678d7f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1423,6 +1423,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1427,6 +1427,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      }
  
@@ -205,5 +205,5 @@ index 6b3bbfe..11e3028 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.9.0
+2.9.0.windows.1
 

Spigot-Server-Patches/0040-Add-player-view-distance-API.patch

@@ -1,4 +1,4 @@
-From 7d7c82acdf08a76fa3f6a7fd6102d8b753df457c Mon Sep 17 00:00:00 2001
+From 068369d52a9520129daf8c4f175e21d3eff59ec6 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
@@ -107,10 +107,10 @@ index 797a84f..df6801f 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index eac8062..9955de3 100644
+index 64c9c1c..e09dc78 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1434,6 +1434,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1438,6 +1438,16 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return this.getHandle().affectsSpawning;
      }
  
@@ -128,5 +128,5 @@ index eac8062..9955de3 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.8.3.windows.1
+2.9.0.windows.1
 

Spigot-Server-Patches/0073-Complete-resource-pack-API.patch

@@ -1,11 +1,11 @@
-From a583c941f42db8331d0edfd157c9d568300e1a0a Mon Sep 17 00:00:00 2001
+From 23fc12506a96c04c5b860836943e912fbf12192c Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 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 9abe333..cb1169c 100644
+index 7d67e67..d5e06f0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1027,7 +1027,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -24,7 +24,7 @@ index 9abe333..cb1169c 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 101dc2b..9299695 100644
+index 0c0906a..e372761 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -72,6 +72,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -38,7 +38,7 @@ index 101dc2b..9299695 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1540,6 +1544,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1544,6 +1548,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          ((WorldServer) getHandle().world).getPlayerChunkMap().updateViewDistance(getHandle(), viewDistance);
      }
  
@@ -72,5 +72,5 @@ index 101dc2b..9299695 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.9.0
+2.9.0.windows.1
 

Spigot-Server-Patches/0134-Implement-PlayerLocaleChangeEvent.patch

@@ -1,4 +1,4 @@
-From e9c013296bbcc5353de1a2e9795b6b3a0839198d Mon Sep 17 00:00:00 2001
+From 6f704a2371844fedc58d1c405720b925db4bc2b6 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
@@ -34,10 +34,10 @@ index e9baaa2..d084fc2 100644
          this.ci = packetplayinsettings.d();
          this.getDataWatcher().set(EntityPlayer.br, Byte.valueOf((byte) packetplayinsettings.e()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e20c4ef..3f871a7 100644
+index f2d1b21..3b95336 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1671,7 +1671,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1675,7 +1675,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {
@@ -50,5 +50,5 @@ index e20c4ef..3f871a7 100644
  
          @Override
 -- 
-2.9.0
+2.9.0.windows.1
 

work/Bukkit

@@ -1 +1 @@
-Subproject commit f0973327a93ed495f86e96a3e32bc5678b66a15d
+Subproject commit db2ee1f9776478e4935304a1365a7ccd100185a1

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 6b843d995ffa4b1d5e50124bb67ea58289598596
+Subproject commit 67b242440b79352602c8328158effcd5a4c1fda9

work/Spigot

@@ -1 +1 @@
-Subproject commit 3996d7d5c02c6a13ff621eb3cb37c17fc7ec1954
+Subproject commit a9631d283112b9a22a1a3969ad3fd9d611915589