36f34f01c0
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 Bukkit Changes: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
38 Zeilen
1.3 KiB
Diff
38 Zeilen
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 a7f08bb1c0778d99f06abfd15bb4a1a8bef6d502..3adff676c85a6648fc85a088e12ea524f4567b12 100644
|
|
--- a/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
+++ b/src/main/java/org/bukkit/entity/HumanEntity.java
|
|
@@ -324,6 +324,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.
|
|
*
|