Rename getPotentialBedLocation to getPotentialRespawnLocation (PaperM…

…C#11950)
LemonCaramel · Jan 12, 2025 · 08ac057 · 08ac057
1 parent ed75b0e
commit 08ac057
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/paper-api/src/main/java/org/bukkit/entity/HumanEntity.java b/paper-api/src/main/java/org/bukkit/entity/HumanEntity.java
@@ -453,9 +453,25 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
      * is still valid.
      *
      * @return Bed Location if has slept in one, otherwise null.
+     * @see #getPotentialRespawnLocation()
+     * @deprecated Misleading name. This method also returns the location of
+     * respawn anchors.
      */
     @Nullable
-    public Location getPotentialBedLocation();
+    @Deprecated(since = "1.21.4")
+    default Location getPotentialBedLocation() {
+        return this.getPotentialRespawnLocation();
+    }
+
+    /**
+     * Gets the Location where the player will spawn at, null if they
+     * don't have a valid respawn point. This method will not attempt
+     * to validate if the current respawn location is still valid.
+     *
+     * @return respawn location if exists, otherwise null.
+     */
+    @Nullable
+    Location getPotentialRespawnLocation();
     // Paper end
     // Paper start
     /**

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -154,7 +154,7 @@ public int getSleepTicks() {
 
     // Paper start - Potential bed api
     @Override
-    public Location getPotentialBedLocation() {
+    public Location getPotentialRespawnLocation() {
         ServerPlayer handle = (ServerPlayer) getHandle();
         BlockPos bed = handle.getRespawnPosition();
         if (bed == null) {