SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Upstream

Browse Source
This commit is contained in:
Spottedleaf
2019-05-05 19:58:04 -07:00
parent 52cd8744e0
commit f9f71eb14e
321 changed files with 809 additions and 856 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Spigot-Server-Patches/Add-ArmorStand-Item-Meta.patch
View File

@@ -13,7 +13,7 @@ starting point for future additions in this area.
Fixes GH-559
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index dd02fb95a..7c2c4ecc5 100644
index 929d73692a..df70c5c0ef 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -0,0 +0,0 @@ public final class CraftItemFactory implements ItemFactory {
@@ -26,7 +26,7 @@ index dd02fb95a..7c2c4ecc5 100644
case CHEST:
case TRAPPED_CHEST:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
index 6c00ca737..4d8013685 100644
index 00497350a3..88154d2f23 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -0,0 +0,0 @@ public final class CraftItemStack extends ItemStack {
@@ -40,7 +40,7 @@ index 6c00ca737..4d8013685 100644
case TRAPPED_CHEST:
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
new file mode 100644
index 000000000..c00b89c8d
index 0000000000..c00b89c8d4
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
@@ -0,0 +0,0 @@
@@ -356,23 +356,23 @@ index 000000000..c00b89c8d
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index b3f8249b0..9435136cc 100644
index 0d513e1f33..159037fc3e 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
.put(CraftMetaCharge.class, "FIREWORK_EFFECT")
.put(CraftMetaKnowledgeBook.class, "KNOWLEDGE_BOOK")
.put(CraftMetaTropicalFishBucket.class, "TROPICAL_FISH_BUCKET")
.put(CraftMetaCrossbow.class, "CROSSBOW")
+ .put(CraftMetaArmorStand.class, "ARMOR_STAND")
.put(CraftMetaItem.class, "UNSPECIFIC")
.build();
@@ -0,0 +0,0 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
CraftMetaCharge.EXPLOSION.NBT,
CraftMetaBlockState.BLOCK_ENTITY_TAG.NBT,
CraftMetaKnowledgeBook.BOOK_RECIPES.NBT,
- CraftMetaTropicalFishBucket.VARIANT.NBT
+ CraftMetaTropicalFishBucket.VARIANT.NBT,
CraftMetaTropicalFishBucket.VARIANT.NBT,
CraftMetaCrossbow.CHARGED.NBT,
- CraftMetaCrossbow.CHARGED_PROJECTILES.NBT
+ CraftMetaCrossbow.CHARGED_PROJECTILES.NBT,
+ // Paper start
+ CraftMetaArmorStand.ENTITY_TAG.NBT,
+ CraftMetaArmorStand.INVISIBLE.NBT,
@@ -385,7 +385,7 @@ index b3f8249b0..9435136cc 100644
}
return HANDLED_TAGS;
diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
index 176b8f528..93c4e1239 100644
index 6abde9030d..2a0852675b 100644
--- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
+++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
@@ -0,0 +0,0 @@ import java.util.ArrayList;
@@ -403,8 +403,7 @@ index 176b8f528..93c4e1239 100644
+ },
+ // Paper start
+ new StackProvider(Material.ARMOR_STAND) {
+ @Override
+ ItemStack operate(ItemStack cleanStack) {
+ @Override ItemStack operate(ItemStack cleanStack) {
+ final ArmorStandMeta meta = (ArmorStandMeta) cleanStack.getItemMeta();
+ meta.setInvisible(true);
+ cleanStack.setItemMeta(meta);