Merge pull request #1244

3e19de0c Rebuild Patches (BillyGalbreath) 8e5db995 AnvilDamageEvent (BillyGalbreath) * pull/1244/head: Rebuild Patches AnvilDamageEvent
2018-07-30 00:12:03 -04:00 · 2018-07-30 00:12:03 -04:00 · c7dcc8ce89
commit c7dcc8ce89
parent 4fa289b8ba 3e19de0cf5
14 changed files with 218 additions and 34 deletions
--- a/Spigot-API-Patches/0129-Expand-ArmorStand-API.patch
+++ b/Spigot-API-Patches/0129-Expand-ArmorStand-API.patch
@ -0,0 +1,117 @@
+From 903ef20f911aefe950c3b48f2731c805a09ad6d9 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
+
+Add the following:
+- Add proper methods for getting and setting items in both hands. Deprecates old methods
+- 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 099da6ce..7a8f4eb7 100644
+--- a/src/main/java/org/bukkit/entity/ArmorStand.java
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
+@@ -1,5 +1,6 @@
+ package org.bukkit.entity;
+ 
+import org.bukkit.inventory.EquipmentSlot;
+ import org.bukkit.inventory.ItemStack;
+ import org.bukkit.util.EulerAngle;
+ 
+@@ -10,7 +11,12 @@ public interface ArmorStand extends LivingEntity {
+      * 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 // Paper
+     ItemStack getItemInHand();
+ 
+     /**
+@@ -18,7 +24,12 @@ public interface ArmorStand extends LivingEntity {
+      * holding
+      *
+      * @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 // Paper
+     void setItemInHand(ItemStack item);
+ 
+     /**
+@@ -275,5 +286,67 @@ public interface ArmorStand extends LivingEntity {
+      * @param move {@code true} if this armour stand can move, {@code false} otherwise
+      */
+     void setCanMove(boolean move);
+
+    /**
+     * Returns the item the armor stand has
+     * equip in the given equipment slot
+     *
+     * @param slot the equipment slot to get
+     */
+    ItemStack getItem(final org.bukkit.inventory.EquipmentSlot slot);
+
+    /**
+     * Sets the item the armor stand has
+     * equip in the given equipment slot
+     *
+     * @param slot the equipment slot to set
+     * @param item the item to hold
+     */
+    void setItem(final org.bukkit.inventory.EquipmentSlot slot, final ItemStack item);
+
+    /**
+     * Get the list of disabled slots
+     *
+     * @return list of disabled slots
+     */
+    java.util.Set<org.bukkit.inventory.EquipmentSlot> getDisabledSlots();
+
+    /**
+     * Set the disabled slots
+     *
+     * This makes it so a player is unable to interact with the Armor Stand to place, remove, or replace an item in the given slot(s)
+     * Note: Once a slot is disabled, the only way to get an item back it to break the armor stand.
+     *
+     * @param slots var-arg array of slots to lock
+     */
+    void setDisabledSlots(org.bukkit.inventory.EquipmentSlot... slots);
+
+    /**
+     * Disable specific slots, adding them
+     * to the currently disabled slots
+     *
+     * This makes it so a player is unable to interact with the Armor Stand to place, remove, or replace an item in the given slot(s)
+     * Note: Once a slot is disabled, the only way to get an item back it to break the armor stand.
+     *
+     * @param slots var-arg array of slots to lock
+     */
+    void addDisabledSlots(final org.bukkit.inventory.EquipmentSlot... slots);
+
+    /**
+     * Remove the given slots from the disabled
+     * slots list, enabling them.
+     *
+     * This makes it so a player is able to interact with the Armor Stand to place, remove, or replace an item in the given slot(s)
+     *
+     * @param slots var-arg array of slots to unlock
+     */
+    void removeDisabledSlots(final org.bukkit.inventory.EquipmentSlot... slots);
+
+    /**
+     * Check if a specific slot is disabled
+     *
+     * @return {@code true} if the slot is disabled, else {@code false}.
+     */
+    boolean isSlotDisabled(org.bukkit.inventory.EquipmentSlot slot);
+     // Paper end
+ }
+-- 
+2.18.0
+