From 2f4fe0962b30fd9f94e5458c52429c46ca95cfa5 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 15 May 2019 19:12:22 +0100 Subject: [PATCH] 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: f6909573 SPIGOT-4935: Lore deserializes incorrectly from previous versions dd99c5bb SPIGOT-4929: Beacon inventory getType() returns CHEST --- ...ement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch | 8 ++++---- work/CraftBukkit | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch b/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch index 923f8f8d36..3052b17633 100644 --- a/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch +++ b/Spigot-Server-Patches/0307-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch @@ -1,11 +1,11 @@ -From bcab389ca1ab07d529fc53068b3a5fd1bb620378 Mon Sep 17 00:00:00 2001 +From 03504f1bffd46f5e345a95ecaed1afed938c9ae7 Mon Sep 17 00:00:00 2001 From: Mark Vainomaa Date: Wed, 12 Sep 2018 18:53:55 +0300 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java -index 3a215dea43..ea93452e6d 100644 +index 3a215dea4..ea93452e6 100644 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java @@ -43,7 +43,7 @@ public class ArgumentBlock { @@ -32,7 +32,7 @@ index 3a215dea43..ea93452e6d 100644 this.s = this::l; if (this.i.canRead() && this.i.peek() == '#') { diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java -index 159037fc3e..9dcf2d20f2 100644 +index a8b267487..c175c20a9 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java @@ -86,6 +86,12 @@ import org.bukkit.persistence.PersistentDataContainer; @@ -196,7 +196,7 @@ index 159037fc3e..9dcf2d20f2 100644 + } + // Paper end + - static NBTTagList createStringList(List list) { + NBTTagList createStringList(List list) { if (list == null || list.isEmpty()) { return null; @@ -754,7 +862,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta { diff --git a/work/CraftBukkit b/work/CraftBukkit index 89c52b7b0e..f690957311 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 89c52b7b0eced8aef6ebbab4adcc1d77e7e4c35f +Subproject commit f69095731175a8d77f6c6f973721fa9a7182ff5d