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

Update upstream

Browse Source
This commit is contained in:
Aikar
2018-07-23 23:00:57 -04:00
parent d807cf08e1
commit 6ee16a913b
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ index e2699564a..aad380c3b 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..30941c7b0
index 000000000..0e8acf12e
--- /dev/null
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
@@ -0,0 +0,0 @@
@@ -219,8 +219,8 @@ index 000000000..30941c7b0
+ }
+
+ @Override
+ void deserializeInternal(NBTTagCompound tag) {
+ super.deserializeInternal(tag);
+ void deserializeInternal(NBTTagCompound tag, Object context) {
+ super.deserializeInternal(tag, context);
+
+ if (tag.hasKey(ENTITY_TAG.NBT)) {
+ entityTag = tag.getCompound(ENTITY_TAG.NBT);
@@ -354,7 +354,7 @@ index 000000000..30941c7b0
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
index f1430d226..a3f293e4c 100644
index f21c1e846..a5fcf6bd5 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 {