From 2d78bb5776cb96de6f5199da83c85ffbb3639297 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <jahnke.nassim@gmail.com>
Date: Sat, 28 Aug 2021 14:45:14 +0200
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) (#6513)

Upstream has released updates that appear 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:
ea7b3a0d #654: Clarify conditions where a bed can explode

CraftBukkit Changes:
e167f280 SPIGOT-6726: NPE when calling getBossBar() on plugin spawned EnderDragon
---
 .../api/0246-Add-OBSTRUCTED-reason-to-BedEnterResult.patch    | 4 ++--
 work/Bukkit                                                   | 2 +-
 work/CraftBukkit                                              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/patches/api/0246-Add-OBSTRUCTED-reason-to-BedEnterResult.patch b/patches/api/0246-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
index eed087f1f..00552e913 100644
--- a/patches/api/0246-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
+++ b/patches/api/0246-Add-OBSTRUCTED-reason-to-BedEnterResult.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add OBSTRUCTED reason to BedEnterResult
 
 
 diff --git a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
-index c7d57e286c11eaa578ff6fd457b02a9ff829aa71..24b371b11347abf31fda4dadde8e0a7af60b181b 100644
+index fd6b83f1f9bb2e25613e3f88e497b9d57d393937..ced77de350fa53889439e945336343a1cca5b9ba 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerBedEnterEvent.java
-@@ -37,6 +37,12 @@ public class PlayerBedEnterEvent extends PlayerEvent implements Cancellable {
+@@ -42,6 +42,12 @@ public class PlayerBedEnterEvent extends PlayerEvent implements Cancellable {
           * Entering the bed is prevented due to the player being too far away.
           */
          TOO_FAR_AWAY,
diff --git a/work/Bukkit b/work/Bukkit
index ca5b4b1ae..ea7b3a0d8 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit ca5b4b1ae6c3d22ce76f57bec97d298c8914c466
+Subproject commit ea7b3a0d809057eb8edfbb2b8f048077468e8ac6
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 5be41fb80..e167f2808 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 5be41fb80fa84c15359d271c38b52a1e815ea9f9
+Subproject commit e167f28088ed0d6004d9c2775a98260d765edda2