From 099911fbd10aace5192a896c25aef594ea29a164 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 17 Dec 2017 01:34:54 -0500 Subject: [PATCH] Update upstream --- .../0258-Fix-cloning-banner-itemstacks.patch | 29 ------------------- work/CraftBukkit | 2 +- 2 files changed, 1 insertion(+), 30 deletions(-) delete mode 100644 Spigot-Server-Patches/0258-Fix-cloning-banner-itemstacks.patch diff --git a/Spigot-Server-Patches/0258-Fix-cloning-banner-itemstacks.patch b/Spigot-Server-Patches/0258-Fix-cloning-banner-itemstacks.patch deleted file mode 100644 index 6703adcaff..0000000000 --- a/Spigot-Server-Patches/0258-Fix-cloning-banner-itemstacks.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d8ba17b1464eb0fe35132f092a972c8b97adeeb1 Mon Sep 17 00:00:00 2001 -From: Aikar -Date: Fri, 15 Dec 2017 15:52:28 -0500 -Subject: [PATCH] Fix cloning banner itemstacks - -the banner meta would end up with a shared reference to the patterns - -diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java -index aa1a210a2..3ae4604f0 100644 ---- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java -+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBanner.java -@@ -200,4 +200,14 @@ public class CraftMetaBanner extends CraftMetaItem implements BannerMeta { - boolean applicableTo(Material type) { - return type == Material.BANNER; - } -+ -+ // Paper start -+ @Override -+ public CraftMetaBanner clone() { -+ CraftMetaBanner clone = (CraftMetaBanner) super.clone(); -+ clone.base = this.base; -+ clone.patterns = new ArrayList<>(this.patterns); -+ return clone; -+ } -+ // Paper end - } --- -2.15.1 - diff --git a/work/CraftBukkit b/work/CraftBukkit index 2ee49b4955..45c83860e1 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 2ee49b4955aaab9f3827db8771da59b2b403ad9a +Subproject commit 45c83860e115f1f09c050459b5a4bd2e09bea053