mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Updated Upstream (Bukkit)

Browse source 
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:
af40a289 Deprecate ArmorStand equipment methods in favour of the standard and more complete EntityEquipment methods
This commit is contained in:
Shane Freeder 2020-01-22 18:19:54 +00:00
parent 19ff55ef0d
commit f11d64728f
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
4 changed files with 26 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Spigot-API-Patches/0127-Expand-ArmorStand-API.patch
View file

@ -1,4 +1,4 @@
From 9e96b61f51f46e55188303f9321ac3d6272e5ecd Mon Sep 17 00:00:00 2001
From 6d256689d807852a6877064758b8c9d9d42beaaf Mon Sep 17 00:00:00 2001
From: willies952002 <admin@domnian.com>
Date: Thu, 26 Jul 2018 02:22:44 -0400
Subject: [PATCH] Expand ArmorStand API
@ -8,44 +8,36 @@ Add the following:
- Enable/Disable slot interactions
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
index 492df420..e7f71e65 100644
index c8c08f1f..af70bac7 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -1,5 +1,6 @@
@@ -1,6 +1,7 @@
package org.bukkit.entity;
import org.bukkit.inventory.EntityEquipment;
+import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.bukkit.util.EulerAngle;
import org.jetbrains.annotations.NotNull;
@@ -12,8 +13,13 @@ public interface ArmorStand extends LivingEntity {
* currently holding
@@ -12,7 +13,7 @@ public interface ArmorStand extends LivingEntity {
* Returns the item the armor stand is currently holding.
*
* @return the held item
+ // Paper start - Deprecate in favor of setItemInMainHand
+ * @deprecated use {@link ArmorStand#getItem(EquipmentSlot)} instead
+ * @see ArmorStand#getItem(EquipmentSlot)
+ // Paper end
- * @deprecated prefer {@link EntityEquipment#getItemInHand()}
+ * @deprecated prefer {@link ArmorStand#getItem(EquipmentSlot)} // Paper
* @see #getEquipment()
*/
@NotNull
+ @Deprecated // Paper
ItemStack getItemInHand();
/**
@@ -21,7 +27,12 @@ public interface ArmorStand extends LivingEntity {
* holding
@@ -24,7 +25,7 @@ public interface ArmorStand extends LivingEntity {
*
* @param item the item to hold
+ // Paper start - Deprecate in favor of setItemInMainHand
+ * @deprecated use {@link ArmorStand#setItem(EquipmentSlot, ItemStack)} instead
+ * @see ArmorStand#setItem(EquipmentSlot, ItemStack)
+ // Paper end
* @deprecated prefer
- * {@link EntityEquipment#setItemInHand(org.bukkit.inventory.ItemStack)}
+ * {@link ArmorStand#setItem(EquipmentSlot, ItemStack)} // Paper
* @see #getEquipment()
*/
+ @Deprecated // Paper
void setItemInHand(@Nullable ItemStack item);
/**
@@ -304,5 +315,71 @@ public interface ArmorStand extends LivingEntity {
@Deprecated
@@ -324,5 +325,71 @@ public interface ArmorStand extends LivingEntity {
* @param tick {@code true} if this armour stand can tick, {@code false} otherwise
*/
void setCanTick(final boolean tick);
@ -118,5 +110,5 @@ index 492df420..e7f71e65 100644
// Paper end
}
--
2.25.0.windows.1
2.25.0