3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-21 05:50:05 +01:00

Updated Upstream (Bukkit)

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
Dieser Commit ist enthalten in:
Shane Freeder 2020-01-22 18:19:54 +00:00
Ursprung 19ff55ef0d
Commit f11d64728f
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: A3F61EA5A085289C
4 geänderte Dateien mit 26 neuen und 34 gelöschten Zeilen

Datei anzeigen

@ -1,14 +1,14 @@
From 7810dbaa9a938b5ea942e829753f33c17e252c35 Mon Sep 17 00:00:00 2001
From 513f6bcf5563fb3d9fd1401cd1a62f4f24c33a2c Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 21 Dec 2016 11:47:25 -0600
Subject: [PATCH] Add API methods to control if armour stands can move
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
index d04e52fb..387d04e5 100644
index beeba55d..6a854d7c 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -271,4 +271,22 @@ public interface ArmorStand extends LivingEntity {
@@ -291,4 +291,22 @@ public interface ArmorStand extends LivingEntity {
* @param marker whether this is a marker
*/
void setMarker(boolean marker);
@ -32,5 +32,5 @@ index d04e52fb..387d04e5 100644
+ // Paper end
}
--
2.25.0.windows.1
2.25.0

Datei anzeigen

@ -1,14 +1,14 @@
From d96028ef5dcba7e24f0b1d62efcbc758dc48268c Mon Sep 17 00:00:00 2001
From d89438d8840b5f6d1a6e8cff20a8ab0f4b08e5ff Mon Sep 17 00:00:00 2001
From: kashike <kashike@vq.lc>
Date: Wed, 15 Aug 2018 01:26:03 -0700
Subject: [PATCH] Allow disabling armour stand ticking
diff --git a/src/main/java/org/bukkit/entity/ArmorStand.java b/src/main/java/org/bukkit/entity/ArmorStand.java
index 387d04e5..492df420 100644
index 6a854d7c..c8c08f1f 100644
--- a/src/main/java/org/bukkit/entity/ArmorStand.java
+++ b/src/main/java/org/bukkit/entity/ArmorStand.java
@@ -288,5 +288,21 @@ public interface ArmorStand extends LivingEntity {
@@ -308,5 +308,21 @@ public interface ArmorStand extends LivingEntity {
* @param move {@code true} if this armour stand can move, {@code false} otherwise
*/
void setCanMove(boolean move);
@ -31,5 +31,5 @@ index 387d04e5..492df420 100644
// Paper end
}
--
2.25.0.windows.1
2.25.0

Datei anzeigen

@ -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

@ -1 +1 @@
Subproject commit d6b23768eeefee2861cd0492e24f0d699e4389f1
Subproject commit af40a2893510c9e208dd0a26f504733a4a410f45