mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-30 00:34:50 +02:00
0976d52bbd
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Please note that this build includes changes to meet upstreams requirements for nullability annotations. While we aim for a level of accuracy, these might not be 100% correct, if there are any issues, please speak to us on discord, or open an issue on the tracker to discuss. Bukkit Changes: 9a6a1de3 Remove nullability annotations from enum constructors 3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API CraftBukkit Changes:8d8475fcSPIGOT-4666: Force parameter in HumanEntity#sleep8b1588e2Fix ExplosionPrimeEvent#setFire not working with EnderCrystals39a287b7Don't ignore newlines in PlayerListHeader/Footer Spigot Changes: cf694d87 Add nullability annotations
41 lines
1.4 KiB
Diff
41 lines
1.4 KiB
Diff
From 5fcee5665b665276220dc2a9eedb5588880b2f9d Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Sat, 17 Jun 2017 15:04:51 -0400
|
|
Subject: [PATCH] Shoulder Entities Release API
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/entity/HumanEntity.java b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
index f76bc85c4..037e23930 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -331,6 +331,26 @@ public interface HumanEntity extends LivingEntity, AnimalTamer, InventoryHolder
|
|
*/
|
|
public int getExpToLevel();
|
|
|
|
+ // Paper start
|
|
+ /**
|
|
+ * If there is an Entity on this entities left shoulder, it will be released to the world and returned.
|
|
+ * If no Entity is released, null will be returned.
|
|
+ *
|
|
+ * @return The released entity, or null
|
|
+ */
|
|
+ @Nullable
|
|
+ public Entity releaseLeftShoulderEntity();
|
|
+
|
|
+ /**
|
|
+ * If there is an Entity on this entities left shoulder, it will be released to the world and returned.
|
|
+ * If no Entity is released, null will be returned.
|
|
+ *
|
|
+ * @return The released entity, or null
|
|
+ */
|
|
+ @Nullable
|
|
+ public Entity releaseRightShoulderEntity();
|
|
+ // Paper end
|
|
+
|
|
/**
|
|
* Discover a recipe for this player such that it has not already been
|
|
* discovered. This method will add the key's associated recipe to the
|
|
--
|
|
2.21.0
|
|
|