diff --git a/LICENSE.md b/LICENSE.md
index 83a6cbd56d..6bd7bdc0c3 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -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>
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 4857a4e7cb..0000000000
--- 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 <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();
diff --git a/work/Bukkit b/work/Bukkit
index 632aa12080..ff64962b52 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 632aa120808402af8933aef8d991e7935c9c0130
+Subproject commit ff64962b522ce7bb711573a50d24367a840fa49a
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 401f1ad587..8f3647242a 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 401f1ad587d77df330becb7aaa22e3751a2ef94e
+Subproject commit 8f3647242a7eadf8e2a7faf623089767c0466b52