mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-30 16:54:55 +02:00
ef0e5a642d
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: 9ae3f10f SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API 48c0c547 PR-786: Add methods to get sounds from entities CraftBukkit Changes: 5cc9c022a SPIGOT-7152: Handle hand item changing during air interact event 4ffa1acf6 SPIGOT-7154: Players get kicked when interacting with a conversation 4daa21123 SPIGOT-3842: Add Player#fireworkBoost() and expand Firework API e5d6a9bbf PR-1100: Add methods to get sounds from entities b7e9f1c8b SPIGOT-7146: Reduce use of Material switch in ItemMeta Spigot Changes: 4c157bb4 Rebuild patches
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: JRoy <joshroy126@gmail.com>
|
|
Date: Sun, 10 May 2020 23:06:41 -0400
|
|
Subject: [PATCH] Potential bed API
|
|
|
|
Adds a new method to fetch the location of a player's bed without generating any sync loads.
|
|
|
|
getPotentialBedLocation - Gets the last known location of a player's bed. This does not preform any check if the bed is still valid and does not load any chunks.
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
index 8f489abbb7e80d869ca0f6e8626cecbd453b625a..0775c1061a72af66344ec45248b50072c394da38 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -249,6 +249,19 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
|
|
*/
|
|
public int getSleepTicks();
|
|
|
|
+
|
|
+ // Paper start - Potential bed api
|
|
+ /**
|
|
+ * Gets the Location of the player's bed, null if they have not slept
|
|
+ * in one. This method will not attempt to validate if the current bed
|
|
+ * is still valid.
|
|
+ *
|
|
+ * @return Bed Location if has slept in one, otherwise null.
|
|
+ */
|
|
+ @Nullable
|
|
+ public Location getPotentialBedLocation();
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Attempts to make the entity sleep at the given location.
|
|
* <br>
|