mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-19 02:33:04 +02:00
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: af88996a SPIGOT-6890: Add repair cost amount in AnvilInventory bc7bd363 PR-716: Fix scheduler javadocs (previously, the <b> tag broke the rendering) 6db1ab70 Improve item cooldown JavaDocs CraftBukkit Changes: 13670b44 SPIGOT-6890: Add repair cost amount in AnvilInventory 0d109e86 PR-999: Prevent non-item cooldowns
38 lines
1.3 KiB
Diff
38 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 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 f607c57275958bf1cbf8e77b4d7efa936064c228..8a479c7dfd3825fab8bb057d8afa5ae0cb01b071 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -318,6 +318,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
|
|
+
|
|
/**
|
|
* Gets the current cooldown for a player's attack.
|
|
*
|