diff --git a/Paper b/Paper index ab347c4c9..7ce690f49 160000 --- a/Paper +++ b/Paper @@ -1 +1 @@ -Subproject commit ab347c4c96b66cf4e67ac303b25fd86d4d17e2af +Subproject commit 7ce690f49e8e57a11d0737cb9258978634abd352 diff --git a/current-paper b/current-paper index 699e8ae1b..b52b004b1 100644 --- a/current-paper +++ b/current-paper @@ -1 +1 @@ -1.16.1--af7fcad12b93174f1c2d487fa2c00ffd262efd43 +1.16.1--3150404176b0594249ff18968f5ff4663bbc95a9 diff --git a/patches/server/0001-Rebrand.patch b/patches/server/0001-Rebrand.patch index 1f328f362..47df01761 100644 --- a/patches/server/0001-Rebrand.patch +++ b/patches/server/0001-Rebrand.patch @@ -1,4 +1,4 @@ -From 3a3464e136495567803d13620ab7fe5fe349b291 Mon Sep 17 00:00:00 2001 +From 4c46391a0e33451b0574cacdc1596a713f90f05d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 4 May 2019 01:02:11 -0500 Subject: [PATCH] Rebrand @@ -15,7 +15,7 @@ Subject: [PATCH] Rebrand create mode 100644 src/main/java/net/pl3x/purpur/PurpurVersionFetcher.java diff --git a/pom.xml b/pom.xml -index ef8ee637a8..8044fa0740 100644 +index ef8ee637a..8044fa074 100644 --- a/pom.xml +++ b/pom.xml @@ -1,12 +1,11 @@ @@ -95,7 +95,7 @@ index ef8ee637a8..8044fa0740 100644 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index 74ed02fa92..c1280478ee 100644 +index 74ed02fa9..c1280478e 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java @@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @@ -108,7 +108,7 @@ index 74ed02fa92..c1280478ee 100644 .completer(new ConsoleCommandCompleter(this.server)) ); diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index d8d11ed962..bfdff5c96d 100644 +index 26f230a80..d06536aba 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -1446,7 +1446,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant Date: Sat, 1 Feb 2020 22:22:16 -0600 Subject: [PATCH] MoonPhase API @@ -8,10 +8,10 @@ Subject: [PATCH] MoonPhase API 1 file changed, 7 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index fb24b9d07..192c99db1 100644 +index 724c0816d..8506ca886 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2604,4 +2604,11 @@ public class CraftWorld implements World { +@@ -2613,4 +2613,11 @@ public class CraftWorld implements World { return spigot; } // Spigot end diff --git a/patches/server/0014-ItemFactory-getMonsterEgg.patch b/patches/server/0014-ItemFactory-getMonsterEgg.patch index e519e2f4d..e6b3708fa 100644 --- a/patches/server/0014-ItemFactory-getMonsterEgg.patch +++ b/patches/server/0014-ItemFactory-getMonsterEgg.patch @@ -1,4 +1,4 @@ -From 38fdad1ea7b019df25e4e4d00c6f0776795bc7e1 Mon Sep 17 00:00:00 2001 +From ca23ccf9910f7575eedbfa49f004e65da1ab2a06 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 0d62f3ae9..53038d096 100644 +index d56f8ca6a..082b77f15 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java -@@ -345,4 +345,18 @@ public final class CraftItemFactory implements ItemFactory { +@@ -347,4 +347,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/0018-World-getPlacementBlockData.patch b/patches/server/0018-World-getPlacementBlockData.patch index 700ba0be3..ba74fc837 100644 --- a/patches/server/0018-World-getPlacementBlockData.patch +++ b/patches/server/0018-World-getPlacementBlockData.patch @@ -1,4 +1,4 @@ -From ccf75c0f071428349a26221eb9c05d22d6c11466 Mon Sep 17 00:00:00 2001 +From bf81b900510fba99b4f8b9677f5ada6c49780e0d Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Sat, 8 Feb 2020 23:30:17 -0600 Subject: [PATCH] World#getPlacementBlockData @@ -8,10 +8,10 @@ Subject: [PATCH] World#getPlacementBlockData 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -index 192c99db1..be2d2040c 100644 +index 8506ca886..0a6ee278b 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java -@@ -2610,5 +2610,10 @@ public class CraftWorld implements World { +@@ -2619,5 +2619,10 @@ public class CraftWorld implements World { public net.pl3x.purpur.MoonPhase getMoonPhase() { return net.pl3x.purpur.MoonPhase.getPhase(getFullTime() / 24000L); }