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
This commit is contained in:
Nassim Jahnke 2022-08-01 16:01:20 +02:00
parent 20a8246572
commit 73c81910c0
4 changed files with 2 additions and 25 deletions

View file

@ -40,7 +40,6 @@ rickyboy320 <rickw320@hotmail.com>
DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
Josh Roy <10731363+JRoy@users.noreply.github.com>
ysl3000 <yannicklamprecht@live.de>
Nassim Jahnke <nassim@njahnke.dev>
Machine_Maker <machine@machinemaker.me>
Ivan Pekov <ivan@mrivanplays.com>
Camotoy <20743703+Camotoy@users.noreply.github.com>

View file

@ -1,22 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
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<TickTa
public ChatDecorator getChatDecorator() {
return (entityplayer, ichatbasecomponent) -> {
+ // 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();

@ -1 +1 @@
Subproject commit 632aa120808402af8933aef8d991e7935c9c0130
Subproject commit ff64962b522ce7bb711573a50d24367a840fa49a

@ -1 +1 @@
Subproject commit 401f1ad587d77df330becb7aaa22e3751a2ef94e
Subproject commit 8f3647242a7eadf8e2a7faf623089767c0466b52