From 73c81910c00d0bb0af046ac21c2ae5c84878203c Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Mon, 1 Aug 2022 16:01:20 +0200 Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: ff64962b SPIGOT-7124: MapPalette.getColor(0) returns the wrong color CraftBukkit Changes: 8f3647242 SPIGOT-7127: /say doesn't work from console --- LICENSE.md | 1 - .../Dont-fire-preview-event-for-console.patch | 22 ------------------- work/Bukkit | 2 +- work/CraftBukkit | 2 +- 4 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 patches/server/Dont-fire-preview-event-for-console.patch diff --git a/LICENSE.md b/LICENSE.md index 83a6cbd56..6bd7bdc0c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -40,7 +40,6 @@ rickyboy320 DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com> Josh Roy <10731363+JRoy@users.noreply.github.com> ysl3000 -Nassim Jahnke Machine_Maker Ivan Pekov Camotoy <20743703+Camotoy@users.noreply.github.com> diff --git a/patches/server/Dont-fire-preview-event-for-console.patch b/patches/server/Dont-fire-preview-event-for-console.patch deleted file mode 100644 index 4857a4e7c..000000000 --- a/patches/server/Dont-fire-preview-event-for-console.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nassim Jahnke -Date: Thu, 28 Jul 2022 01:57:24 +0200 -Subject: [PATCH] Dont fire preview event for console - - -diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/net/minecraft/server/MinecraftServer.java -+++ b/src/main/java/net/minecraft/server/MinecraftServer.java -@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { -+ // Paper start - fix non-player sender -+ if (entityplayer == null) { -+ return CompletableFuture.completedFuture(ichatbasecomponent); -+ } -+ // Paper end - return CompletableFuture.supplyAsync(() -> { - AsyncPlayerChatPreviewEvent event = new AsyncPlayerChatPreviewEvent(true, entityplayer.getBukkitEntity(), CraftChatMessage.fromComponent(ichatbasecomponent), new LazyPlayerSet(this)); - String originalFormat = event.getFormat(), originalMessage = event.getMessage(); diff --git a/work/Bukkit b/work/Bukkit index 632aa1208..ff64962b5 160000 --- a/work/Bukkit +++ b/work/Bukkit @@ -1 +1 @@ -Subproject commit 632aa120808402af8933aef8d991e7935c9c0130 +Subproject commit ff64962b522ce7bb711573a50d24367a840fa49a diff --git a/work/CraftBukkit b/work/CraftBukkit index 401f1ad58..8f3647242 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 401f1ad587d77df330becb7aaa22e3751a2ef94e +Subproject commit 8f3647242a7eadf8e2a7faf623089767c0466b52