From e00471db27ebd85e38534d8105f7ca094143b086 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 14 Apr 2023 00:52:42 +0100
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit)

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:
465c4964 PR-843: Add damage methods to FallingBlock
46ba7c9f SPIGOT-7335: Fix typo in TextDisplay#TextAlignment enum name

CraftBukkit Changes:
818582f40 PR-1169: Add damage methods to FallingBlock
15a3eac66 SPIGOT-7335: Fix typo in TextDisplay#TextAlignment enum name
f01fb4979 SPIGOT-7336: Fix typo in internal method name
---
 patches/api/Entity-Origin-API.patch | 6 +++---
 work/Bukkit                         | 2 +-
 work/CraftBukkit                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/patches/api/Entity-Origin-API.patch b/patches/api/Entity-Origin-API.patch
index 3841c91d11..5f8814cf07 100644
--- a/patches/api/Entity-Origin-API.patch
+++ b/patches/api/Entity-Origin-API.patch
@@ -29,11 +29,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/org/bukkit/entity/FallingBlock.java
 +++ b/src/main/java/org/bukkit/entity/FallingBlock.java
 @@ -0,0 +0,0 @@ public interface FallingBlock extends Entity {
-      * @param hurtEntities whether entities will be damaged by this block.
+      * @param damage the max damage to set. Must be >= 0
       */
-     void setHurtEntities(boolean hurtEntities);
+     void setMaxDamage(int damage);
 +
-+    /**
++     /**
 +     * Gets the source block location of the FallingBlock
 +     *
 +     * @return the source block location the FallingBlock was spawned from
diff --git a/work/Bukkit b/work/Bukkit
index 13eb414669..465c496472 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 13eb41466918e64be98fccf96fd3c75c3ea07ae4
+Subproject commit 465c4964722bd062eb83331142cfa1af63a4f0c2
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 5ee3419b79..818582f409 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 5ee3419b794bc7f9235c234d762dbc7da05cb127
+Subproject commit 818582f409401817e7331a6e31e25a1ae4832ad8