diff --git a/Paper b/Paper index 7ce690f49..8522e7b27 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit 7ce690f49e8e57a11d0737cb9258978634abd352 +Subproject commit 8522e7b274a5e2e0cb063cbfe4c80f3d8f4a06c2 diff --git a/current-paper b/current-paper index b52b004b1..96aceb486 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.1--3150404176b0594249ff18968f5ff4663bbc95a9 +1.16.1--60c274b0bdfbddf76123182f724083092e5b1fdc diff --git a/patches/server/0014-ItemFactory-getMonsterEgg.patch b/patches/server/0014-ItemFactory-getMonsterEgg.patch index e6b3708fa..672d51051 100644 --- a/patches/server/0014-ItemFactory-getMonsterEgg.patch +++ b/patches/server/0014-ItemFactory-getMonsterEgg.patch @@ -1,4 +1,4 @@ -From ca23ccf9910f7575eedbfa49f004e65da1ab2a06 Mon Sep 17 00:00:00 2001 +From 2f75911f11ee50eb4f5cebfbc040042270e54e2f Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Fri, 5 Jul 2019 16:36:55 -0500 Subject: [PATCH] ItemFactory#getMonsterEgg @@ -22,10 +22,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 d56f8ca6a..082b77f15 100644 +index c28691ae6..616c3e8e4 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -@@ -347,4 +347,18 @@ public final class CraftItemFactory implements ItemFactory { +@@ -349,4 +349,18 @@ public final class CraftItemFactory implements ItemFactory { return nms != null ? net.minecraft.server.LocaleLanguage.getInstance().translateKey(nms.getItem().getName()) : null; } // Paper end diff --git a/patches/server/0032-Fix-vanilla-command-permission-handler.patch b/patches/server/0032-Fix-vanilla-command-permission-handler.patch index 32993412f..de28e69c0 100644 --- a/patches/server/0032-Fix-vanilla-command-permission-handler.patch +++ b/patches/server/0032-Fix-vanilla-command-permission-handler.patch @@ -1,4 +1,4 @@ -From 7627086a8214c93b0a9c2e61981377aeb30553c1 Mon Sep 17 00:00:00 2001 +From 0efc3418e55cf91ac4cfedd251486777e746768d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 28 Mar 2020 01:51:32 -0500 Subject: [PATCH] Fix vanilla command permission handler @@ -9,10 +9,10 @@ Subject: [PATCH] Fix vanilla command permission handler 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/mojang/brigadier/tree/CommandNode.java b/src/main/java/com/mojang/brigadier/tree/CommandNode.java -index bd2802d36..5fa2a45c8 100644 +index 5e3fc338b..b3835c3c7 100644 --- a/src/main/java/com/mojang/brigadier/tree/CommandNode.java +++ b/src/main/java/com/mojang/brigadier/tree/CommandNode.java -@@ -34,6 +34,7 @@ public abstract class CommandNode implements Comparable> { +@@ -35,6 +35,7 @@ public abstract class CommandNode implements Comparable> { private final RedirectModifier modifier; private final boolean forks; private Command command;