From 3a4b8921463d0a12ab0c6e6aa1995a899f0cd33f Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 19 Aug 2018 22:54:42 -0400 Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit) 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 CraftBukkit Changes: 82f4b3b1 SPIGOT-4292: Ignore itemstacks with invalid enchants --- Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch | 8 ++++---- .../0317-Don-t-call-getItemMeta-on-hasItemMeta.patch | 6 +++--- work/CraftBukkit | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch b/Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch index 3a19794de..00a22b8be 100644 --- a/Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch +++ b/Spigot-Server-Patches/0235-Add-ArmorStand-Item-Meta.patch @@ -1,4 +1,4 @@ -From 49bff188ac93c1d1401f4870e0a5dbadba2ae28f Mon Sep 17 00:00:00 2001 +From ce65b11d86cfceb4f0a150f7a1eae6c7075cea87 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sat, 27 Jan 2018 17:04:14 -0500 Subject: [PATCH] Add ArmorStand Item Meta @@ -26,10 +26,10 @@ index 3dbe9d81e..22b9674da 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 ed49a5828..70b05eeaa 100644 +index 69425e838..bdd4bf515 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -394,6 +394,8 @@ public final class CraftItemStack extends ItemStack { +@@ -397,6 +397,8 @@ public final class CraftItemStack extends ItemStack { return new CraftMetaSpawnEgg(item.getTag()); case KNOWLEDGE_BOOK: return new CraftMetaKnowledgeBook(item.getTag()); @@ -354,7 +354,7 @@ index 000000000..0e8acf12e + } +} diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 1d3333fd7..0990e7b3c 100644 +index 3fd208803..360e1fd54 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -136,6 +136,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable { diff --git a/Spigot-Server-Patches/0317-Don-t-call-getItemMeta-on-hasItemMeta.patch b/Spigot-Server-Patches/0317-Don-t-call-getItemMeta-on-hasItemMeta.patch index e355129cb..bc11df80e 100644 --- a/Spigot-Server-Patches/0317-Don-t-call-getItemMeta-on-hasItemMeta.patch +++ b/Spigot-Server-Patches/0317-Don-t-call-getItemMeta-on-hasItemMeta.patch @@ -1,4 +1,4 @@ -From 806e1b68cdd3f0484107a826448800c5d3f6b3d0 Mon Sep 17 00:00:00 2001 +From 09f252112d9099a08fd7a70dd245e3e3ca68f14d Mon Sep 17 00:00:00 2001 From: Hugo Manrique Date: Thu, 26 Jul 2018 14:10:23 +0200 Subject: [PATCH] Don't call getItemMeta on hasItemMeta @@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set. Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves. diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -index ad8a176d6..c9d1999a4 100644 +index 911463f5b..974321df8 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java -@@ -516,7 +516,7 @@ public final class CraftItemStack extends ItemStack { +@@ -519,7 +519,7 @@ public final class CraftItemStack extends ItemStack { @Override public boolean hasItemMeta() { diff --git a/work/CraftBukkit b/work/CraftBukkit index bfb913149..82f4b3b1d 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit bfb9131494176498e2444f7ac69bdc924192ee2e +Subproject commit 82f4b3b1d97e08fb649a5e461aa98e335021fe26