From acb774fbb81be0eab77951af841faebfaa53473d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 3 Jun 2024 17:29:48 +0000
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Upstream has released updates that appear to apply and compile correctly.

[Paper Changes]
PaperMC/Paper@54fbd0c: clarify what getEntityId actually returns (#10839)
---
 gradle.properties                         | 2 +-
 patches/api/0002-Purpur-API-Changes.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 45e7a639b..b52a34219 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,5 +25,5 @@ pufferfishRepo = https://github.com/PlazmaMC/Pufferfish
 pufferfishBranch = ver/1.20
 usePufferfish = true
 
-paperCommit = ac647513b2330e4c58f7c511ed79b1ad5d262be6
+paperCommit = 54fbd0cf0cdc9c2356a108ce5b51ea93e95fa3ac
 purpurCommit = 0cbff64ea99f0878244431477d21d9faa14b768f
diff --git a/patches/api/0002-Purpur-API-Changes.patch b/patches/api/0002-Purpur-API-Changes.patch
index 4ae983213..b80043bf7 100644
--- a/patches/api/0002-Purpur-API-Changes.patch
+++ b/patches/api/0002-Purpur-API-Changes.patch
@@ -977,10 +977,10 @@ index 138d2530de2410f4a9424dabd3e5ce0cd1c1dcd2..10a8d64ad2da0be2c14f34c3e7d1957c
      // Paper start
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 62e3793903905b94eb1a120345015149abb33713..07b8c0dd049ff783fd2e408be634642479bf8b1e 100644
+index 725ef320f929d5e3d141c1ed3246d73a7d741f31..2d12c70b0baa50504619c8e37881a11a56d7df2c 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -1155,4 +1155,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -1159,4 +1159,55 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull String getScoreboardEntryName();
      // Paper end - entity scoreboard name