From 9061d8146bfd1326406abd3f49c0ecf5ffff89f4 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Wed, 29 Aug 2018 05:19:27 -0400
Subject: [PATCH] [Auto] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
9ca2772d API to prevent PlayerBedLeaveEvent from changing a player's spawn location

CraftBukkit Changes:
1486c295 API to prevent PlayerBedLeaveEvent from changing a player's spawn location
---
 .../0188-Shoulder-Entities-Release-API.patch              | 8 ++++----
 Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch      | 8 ++++----
 work/Bukkit                                               | 2 +-
 work/CraftBukkit                                          | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Spigot-Server-Patches/0188-Shoulder-Entities-Release-API.patch b/Spigot-Server-Patches/0188-Shoulder-Entities-Release-API.patch
index e18fa3680..37e5bb06e 100644
--- a/Spigot-Server-Patches/0188-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0188-Shoulder-Entities-Release-API.patch
@@ -1,14 +1,14 @@
-From 17b0566d31b2137a347f9a9e14beb501694f5cd5 Mon Sep 17 00:00:00 2001
+From 5e6237bf393b237fb0d675d4c93d1f99f64aa081 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f6600ce515..d11edae03c 100644
+index 47a286a48..3ab03dd04 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1814,21 +1814,48 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1815,21 +1815,48 @@ public abstract class EntityHuman extends EntityLiving {
          }
          // CraftBukkit end
      }
@@ -62,7 +62,7 @@ index f6600ce515..d11edae03c 100644
      public abstract boolean isSpectator();
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 289e267bdd..38a886fbd5 100644
+index 289e267bd..38a886fbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -455,6 +455,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
diff --git a/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch b/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
index 723b74bae..c6c02a34a 100644
--- a/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
+++ b/Spigot-Server-Patches/0209-Add-PlayerJumpEvent.patch
@@ -1,14 +1,14 @@
-From 8f05603f944100ea26d4fcf0fd5896c9b13838db Mon Sep 17 00:00:00 2001
+From eca509be2245fc905db63ffeae2ef13d4790525c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d11edae03c..9a71fa1e94 100644
+index 3ab03dd04..fcfc8299f 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -1466,6 +1466,7 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -1467,6 +1467,7 @@ public abstract class EntityHuman extends EntityLiving {
          return 0;
      }
  
@@ -17,7 +17,7 @@ index d11edae03c..9a71fa1e94 100644
          super.cH();
          this.a(StatisticList.JUMP);
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7e06e5bc67..4cf738e0f8 100644
+index 7e06e5bc6..4cf738e0f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -59,6 +59,8 @@ import org.bukkit.inventory.CraftingInventory;
diff --git a/work/Bukkit b/work/Bukkit
index 0279d9b41..9ca2772d4 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 0279d9b41516e1fa566848cc5affdd0fca0028de
+Subproject commit 9ca2772d4f0b92029844ee0a1bf69ba1d6e73366
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 3831ae621..1486c2951 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 3831ae621f5b75add3ad528b1f07dd30c154fcae
+Subproject commit 1486c295167e8bf63b00a07e281f3e4fa33a21a3