1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-03 21:37:28 +01:00

Update upstream

This commit is contained in:
Aikar 2017-12-17 01:34:54 -05:00
parent 602a6e2bee
commit 3d71965eb8
2 changed files with 1 additions and 28 deletions

View file

@ -1,27 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
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
@@ -0,0 +0,0 @@ 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
}
--

@ -1 +1 @@
Subproject commit 2ee49b4955aaab9f3827db8771da59b2b403ad9a
Subproject commit 45c83860e115f1f09c050459b5a4bd2e09bea053