From d8a7b12368e7f34338611de3a03d7a45794f0d1b Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 9 Jun 2022 18:20:47 -0700
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot)

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:
45d9c73c SPIGOT-7043: EnderChest does not implement Lidded
86b95f34 SPIGOT-7047: Add Player#getLastDeathLocation

CraftBukkit Changes:
b2557f6ac SPIGOT-7041: Custom BiomeProvider not used when world set to type FLAT
732c50cab SPIGOT-7043: EnderChest does not implement Lidded
6209029ea SPIGOT-7048: addPassenger() not working when vehicle is player
3aa7836df SPIGOT-7047: Add Player#getLastDeathLocation
7d522cd26 SPIGOT-7050: Enchantment data of items will not be saved correctly when saved in YAML configuration file

Spigot Changes:
1dffefb4 Rebuild patches
---
 patches/api/More-Lidded-Block-API.patch       | 10 -------
 ...-replace-OfflinePlayer-getLastPlayed.patch |  4 +--
 patches/server/More-Lidded-Block-API.patch    | 26 ++-----------------
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 work/Spigot                                   |  2 +-
 6 files changed, 7 insertions(+), 39 deletions(-)

diff --git a/patches/api/More-Lidded-Block-API.patch b/patches/api/More-Lidded-Block-API.patch
index 158d560b90..fb911e8dc0 100644
--- a/patches/api/More-Lidded-Block-API.patch
+++ b/patches/api/More-Lidded-Block-API.patch
@@ -4,16 +4,6 @@ Date: Sun, 23 May 2021 17:49:31 +0900
 Subject: [PATCH] More Lidded Block API
 
 
-diff --git a/src/main/java/org/bukkit/block/EnderChest.java b/src/main/java/org/bukkit/block/EnderChest.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/org/bukkit/block/EnderChest.java
-+++ b/src/main/java/org/bukkit/block/EnderChest.java
-@@ -0,0 +0,0 @@ package org.bukkit.block;
- /**
-  * Represents a captured state of an ender chest.
-  */
--public interface EnderChest extends TileState { }
-+public interface EnderChest extends TileState, Lidded { } // Paper - More Lidded Block API
 diff --git a/src/main/java/org/bukkit/block/Lidded.java b/src/main/java/org/bukkit/block/Lidded.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/block/Lidded.java
diff --git a/patches/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch b/patches/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
index a91b4fe8d9..a66f236c3e 100644
--- a/patches/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
+++ b/patches/server/Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch
@@ -103,8 +103,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // Paper end
 +
      @Override
-     public Location getBedSpawnLocation() {
-         CompoundTag data = this.getData();
+     public Location getLastDeathLocation() {
+         if (this.getData().contains("LastDeathLocation", 10)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
diff --git a/patches/server/More-Lidded-Block-API.patch b/patches/server/More-Lidded-Block-API.patch
index 4cde4e2019..957efa8b93 100644
--- a/patches/server/More-Lidded-Block-API.patch
+++ b/patches/server/More-Lidded-Block-API.patch
@@ -41,34 +41,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftEnderChest.java
 @@ -0,0 +0,0 @@ public class CraftEnderChest extends CraftBlockEntityState<EnderChestBlockEntity
-     public CraftEnderChest(World world, EnderChestBlockEntity tileEntity) {
-         super(world, tileEntity);
+         }
+         getTileEntity().openersCounter.opened = false;
      }
 +
 +    // Paper start - More Lidded Block API
 +    @Override
-+    public void open() {
-+        requirePlaced();
-+        if (!getTileEntity().openersCounter.opened) {
-+            net.minecraft.world.level.Level world = getTileEntity().getLevel();
-+            world.blockEvent(getTileEntity().getBlockPos(), getTileEntity().getBlockState().getBlock(), 1, getTileEntity().openersCounter.getOpenerCount() + 1);
-+            world.playSound(null, getPosition(), net.minecraft.sounds.SoundEvents.ENDER_CHEST_OPEN, net.minecraft.sounds.SoundSource.BLOCKS, 0.5F, world.random.nextFloat() * 0.1F + 0.9F);
-+        }
-+        getTileEntity().openersCounter.opened = true;
-+    }
-+
-+    @Override
-+    public void close() {
-+        requirePlaced();
-+        if (getTileEntity().openersCounter.opened) {
-+            net.minecraft.world.level.Level world = getTileEntity().getLevel();
-+            world.blockEvent(getTileEntity().getBlockPos(), getTileEntity().getBlockState().getBlock(), 1, 0);
-+            world.playSound(null, getPosition(), net.minecraft.sounds.SoundEvents.ENDER_CHEST_CLOSE, net.minecraft.sounds.SoundSource.BLOCKS, 0.5F, world.random.nextFloat() * 0.1F + 0.9F);
-+        }
-+        getTileEntity().openersCounter.opened = false;
-+    }
-+
-+    @Override
 +    public boolean isOpen() {
 +        return getTileEntity().openersCounter.opened;
 +    }
diff --git a/work/Bukkit b/work/Bukkit
index 0a4b84d68e..45d9c73c34 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 0a4b84d68e478de6751678238f1d18200ba51bf9
+Subproject commit 45d9c73c34736f64e2bbdf4227081be5d41dc093
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 576a037044..b2557f6acd 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 576a0370445b9c1344b337c02d955142d9004162
+Subproject commit b2557f6acd3a2b065643f1c58a411a20c1eef842
diff --git a/work/Spigot b/work/Spigot
index fa893f0bb7..1dffefb44e 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit fa893f0bb7c6e1cbd28315f77da5c37a67afbe98
+Subproject commit 1dffefb44e3f2feaffe93434bb2e888817798d42