Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
a12a6778 Support String UUID's in old player skulls
b3f265d1 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-07-03 13:12:06 -05:00
parent 00cb90fd13
commit 5db2f9dd75
3 changed files with 4 additions and 4 deletions

2
Paper

Submodule Paper updated: fcbeac8a99...a12a677859

View File

@@ -1 +1 @@
1.16.1--825c40bcd56bcd79b12afad3d005fe5db24721d3
1.16.1--e6f1ad9eb531195dda38f5ab4824569651488b87

View File

@@ -18,10 +18,10 @@ index 6d8321080..793e42072 100644
private final int c;
private final EntityTypes<?> d;
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
index c28691ae6..616c3e8e4 100644
index 1c3e6e0c9..c7067dd85 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
@@ -349,4 +349,18 @@ public final class CraftItemFactory implements ItemFactory {
@@ -353,4 +353,18 @@ public final class CraftItemFactory implements ItemFactory {
return nms != null ? net.minecraft.server.LocaleLanguage.getInstance().translateKey(nms.getItem().getName()) : null;
}
// Paper end