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

@@ -40,7 +40,6 @@ rickyboy320 <rickw320@hotmail.com>
 DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
 JRoy <joshroy126@gmail.com>
 ysl3000 <yannicklamprecht@live.de>
-kennytv <jahnke.nassim@gmail.com>
 Machine_Maker <machine@machinemaker.me>
 Ivan Pekov <ivan@mrivanplays.com>
 Camotoy <20743703+Camotoy@users.noreply.github.com>

patches/api/0198-Add-item-slot-convenience-methods.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Sat, 25 Apr 2020 23:31:28 +0200
 Subject: [PATCH] Add item slot convenience methods
 

patches/api/0236-Add-PlayerItemCooldownEvent.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Tue, 25 Aug 2020 13:45:15 +0200
 Subject: [PATCH] Add PlayerItemCooldownEvent
 

patches/api/0237-More-lightning-API.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Sun, 26 Jul 2020 14:44:16 +0200
 Subject: [PATCH] More lightning API
 

patches/api/0264-Add-dropLeash-variable-to-EntityUnleashEvent.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Fri, 29 Jan 2021 15:13:04 +0100
 Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
 

patches/api/0279-Expose-protocol-version.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Fri, 26 Mar 2021 11:23:27 +0100
 Subject: [PATCH] Expose protocol version
 

patches/api/0313-Missing-Entity-Behavior-API.patch

@@ -3,7 +3,7 @@ From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 Date: Fri, 28 May 2021 21:06:59 -0400
 Subject: [PATCH] Missing Entity Behavior API
 
-Co-authored-by: Nassim Jahnke <jahnke.nassim@gmail.com>
+Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/entity/AbstractHorse.java b/src/main/java/org/bukkit/entity/AbstractHorse.java

patches/api/0327-Fix-plugin-provides-load-order.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Fri, 1 Oct 2021 09:47:00 +0200
 Subject: [PATCH] Fix plugin provides load order
 

patches/api/0364-Implement-regenerateChunk.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Sat, 5 Feb 2022 20:25:28 +0100
 Subject: [PATCH] Implement regenerateChunk
 

patches/removed/1.19.1/0906-Untrash-chat-handling.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Wed, 8 Jun 2022 21:30:34 +0200
 Subject: [PATCH] Untrash chat handling
 

patches/server/0332-Dont-send-unnecessary-sign-update.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Sat, 11 Sep 2021 11:56:51 +0200
 Subject: [PATCH] Dont send unnecessary sign update
 

patches/server/0362-Remove-garbage-Java-version-check.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Wed, 16 Mar 2022 13:58:16 +0100
 Subject: [PATCH] Remove garbage Java version check
 

patches/server/0373-Add-tick-times-API-and-mspt-command.patch

@@ -125,7 +125,7 @@ index 6a00f3d38da8107825ab1d405f337fd077b09f72..d31b5ed47cffc61c90c926a0cd2005b7
  
      public static void registerCommands(final MinecraftServer server) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b04c5433a1e2cdfe69c5b5cbe77b867ebd55c126..d8166025ddd229c065e8c4c3082549f1716c0384 100644
+index 19f38a8d66846d859dd46fb53f3224fe0d7f2eb8..f5fc952e119723d7761408d8ffb95e869d01cb81 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -237,6 +237,11 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -153,7 +153,7 @@ index b04c5433a1e2cdfe69c5b5cbe77b867ebd55c126..d8166025ddd229c065e8c4c3082549f1
          this.frameTimer.logFrameDuration(i1 - i);
          this.profiler.pop();
          org.spigotmc.WatchdogThread.tick(); // Spigot
-@@ -2529,4 +2540,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2534,4 +2545,30 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
      public static record ServerResourcePackInfo(String url, String hash, boolean isRequired, @Nullable Component prompt) {
  
      }

patches/server/0528-Add-PlayerItemCooldownEvent.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Tue, 25 Aug 2020 13:48:33 +0200
 Subject: [PATCH] Add PlayerItemCooldownEvent
 

patches/server/0530-More-lightning-API.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Sun, 26 Jul 2020 14:44:09 +0200
 Subject: [PATCH] More lightning API
 

patches/server/0580-Add-dropLeash-variable-to-EntityUnleashEvent.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Fri, 29 Jan 2021 15:13:11 +0100
 Subject: [PATCH] Add dropLeash variable to EntityUnleashEvent
 

patches/server/0613-Expose-protocol-version.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Fri, 26 Mar 2021 11:23:17 +0100
 Subject: [PATCH] Expose protocol version
 

patches/server/0632-Add-Channel-initialization-listeners.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Thu, 29 Apr 2021 21:19:33 +0200
 Subject: [PATCH] Add Channel initialization listeners
 

patches/server/0647-Move-range-check-for-block-placing-up.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Wed, 8 Jun 2022 10:52:18 +0200
 Subject: [PATCH] Move range check for block placing up
 

patches/server/0672-Missing-Entity-Behavior-API.patch

@@ -3,7 +3,7 @@ From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
 Date: Mon, 21 Jun 2021 23:56:07 -0400
 Subject: [PATCH] Missing Entity Behavior API
 
-Co-authored-by: Nassim Jahnke <jahnke.nassim@gmail.com>
+Co-authored-by: Nassim Jahnke <nassim@njahnke.dev>
 Co-authored-by: Jake Potrebic <jake.m.potrebic@gmail.com>
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Bee.java b/src/main/java/net/minecraft/world/entity/animal/Bee.java

patches/server/0731-Sanitize-ResourceLocation-error-logging.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Thu, 26 Aug 2021 12:09:47 +0200
 Subject: [PATCH] Sanitize ResourceLocation error logging
 

patches/server/0737-Execute-chunk-tasks-mid-tick.patch

@@ -19,7 +19,7 @@ index 23e564b05ba438924180c91f9b19a60731eedd1b..5ec241d49ff5e3a161a39006f05823a5
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d605c4355674644e47ea5ea9e979f7806aed1607..421872f7cc1a3cbb4dc596d0e0fa0f9b63602a8a 100644
+index a7610894e05c763ce405c0a2d91665b83d02980a..097eb29a9fd94d49ff5df71110d250a03d6e4c45 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1303,6 +1303,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -30,7 +30,7 @@ index d605c4355674644e47ea5ea9e979f7806aed1607..421872f7cc1a3cbb4dc596d0e0fa0f9b
              return true;
          } else {
              if (this.haveTime()) {
-@@ -2665,4 +2666,74 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+@@ -2670,4 +2671,74 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
          }
      }
      // Paper end

patches/server/0767-Fix-Bukkit-NamespacedKey-shenanigans.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Sun, 24 Oct 2021 15:49:35 +0200
 Subject: [PATCH] Fix Bukkit NamespacedKey shenanigans
 

patches/server/0772-Ensure-valid-vehicle-status.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Tue, 28 Sep 2021 09:47:47 +0200
 Subject: [PATCH] Ensure valid vehicle status
 

patches/server/0784-Configurable-feature-seeds.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Tue, 31 Aug 2021 17:05:27 +0200
 Subject: [PATCH] Configurable feature seeds
 

patches/server/0789-Prevent-excessive-velocity-through-repeated-crits.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Thu, 25 Nov 2021 10:25:09 +0100
 Subject: [PATCH] Prevent excessive velocity through repeated crits
 

patches/server/0794-Prevent-sending-oversized-item-data-in-equipment-and.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Wed, 1 Dec 2021 12:36:25 +0100
 Subject: [PATCH] Prevent sending oversized item data in equipment and metadata
 

patches/server/0809-Fix-tripwire-state-inconsistency.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Sun, 19 Dec 2021 21:11:20 +0100
 Subject: [PATCH] Fix tripwire state inconsistency
 

patches/server/0816-Configurable-max-block-light-for-monster-spawning.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Thu, 16 Dec 2021 09:40:39 +0100
 Subject: [PATCH] Configurable max block light for monster spawning
 

patches/server/0830-Reset-placed-block-on-exception.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Fri, 7 Jan 2022 11:45:15 +0100
 Subject: [PATCH] Reset placed block on exception
 

patches/server/0834-Kick-on-main-for-illegal-chat.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Mon, 17 Jan 2022 19:47:19 +0100
 Subject: [PATCH] Kick on main for illegal chat
 

patches/server/0843-Implement-regenerateChunk.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Mon, 31 Jan 2022 11:21:50 +0100
 Subject: [PATCH] Implement regenerateChunk
 

patches/server/0858-Force-close-world-loading-screen.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Wed, 2 Mar 2022 09:45:56 +0100
 Subject: [PATCH] Force close world loading screen
 

patches/server/0859-Fix-falling-block-spawn-methods.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Fri, 4 Mar 2022 20:35:19 +0100
 Subject: [PATCH] Fix falling block spawn methods
 

patches/server/0901-Disable-component-selector-resolving-in-books-by-def.patch

@@ -1,5 +1,5 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
+From: Nassim Jahnke <nassim@njahnke.dev>
 Date: Thu, 2 Jun 2022 20:35:58 +0200
 Subject: [PATCH] Disable component selector resolving in books by default
 

patches/server/0924-Dont-fire-preview-event-for-console.patch

@@ -1,22 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Nassim Jahnke <jahnke.nassim@gmail.com>
-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 6a81076239080ae6457308ca2e3628c3d32691bf..e7d1ccffd4b783518a7b200d440f6f12f2ed0c86 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2600,6 +2600,11 @@ 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();

work/Bukkit

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

work/CraftBukkit

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