From f22f64e2924ae8908979a78c5d1668b8e1547085 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Sun, 31 Jul 2022 03:32:30 -0500
Subject: [PATCH] populate missing param in chat preview event

---
 patches/api/0048-Chat-Preview-API.patch    | 9 +++++----
 patches/server/0287-Chat-Preview-API.patch | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/patches/api/0048-Chat-Preview-API.patch b/patches/api/0048-Chat-Preview-API.patch
index a154fbe45..41e0877b6 100644
--- a/patches/api/0048-Chat-Preview-API.patch
+++ b/patches/api/0048-Chat-Preview-API.patch
@@ -6,13 +6,14 @@ Subject: [PATCH] Chat Preview API
 
 diff --git a/src/main/java/org/purpurmc/purpur/event/player/PlayerPreviewChatEvent.java b/src/main/java/org/purpurmc/purpur/event/player/PlayerPreviewChatEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..502896f69a139c9524625a2c0d9029f85276146b
+index 0000000000000000000000000000000000000000..94ccdf11201774f9bea3ba56c4dde148ff5199f8
 --- /dev/null
 +++ b/src/main/java/org/purpurmc/purpur/event/player/PlayerPreviewChatEvent.java
-@@ -0,0 +1,90 @@
+@@ -0,0 +1,91 @@
 +package org.purpurmc.purpur.event.player;
 +
 +import net.kyori.adventure.text.Component;
++import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 +import org.bukkit.Bukkit;
 +import org.bukkit.entity.Player;
 +import org.bukkit.event.Cancellable;
@@ -26,9 +27,9 @@ index 0000000000000000000000000000000000000000..502896f69a139c9524625a2c0d9029f8
 +    private final String originalQuery;
 +    private Component query;
 +
-+    public PlayerPreviewChatEvent(@NotNull Player who, @NotNull String originalQuery, @Nullable Component query) {
++    public PlayerPreviewChatEvent(@NotNull Player who, @Nullable Component query) {
 +        super(who, !Bukkit.isPrimaryThread());
-+        this.originalQuery = originalQuery;
++        this.originalQuery = query == null ? "" : LegacyComponentSerializer.legacySection().serialize(query);
 +        this.query = query;
 +    }
 +
diff --git a/patches/server/0287-Chat-Preview-API.patch b/patches/server/0287-Chat-Preview-API.patch
index 596ea2b50..608d60363 100644
--- a/patches/server/0287-Chat-Preview-API.patch
+++ b/patches/server/0287-Chat-Preview-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Chat Preview API
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a5b09ab0171dd100f9bcf81869346b1d11814092..ac8e7323f3ada11fd58a5df6496c7c96efd916be 100644
+index a5b09ab0171dd100f9bcf81869346b1d11814092..bea0eca314eef1adc3c9625b596f29f8b6f9856f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2628,12 +2628,29 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -28,7 +28,7 @@ index a5b09ab0171dd100f9bcf81869346b1d11814092..ac8e7323f3ada11fd58a5df6496c7c96
              // Paper end
 +            // Purpur start
 +            net.kyori.adventure.text.Component adventureComponent = io.papermc.paper.adventure.PaperAdventure.asAdventure(ichatbasecomponent);
-+            org.purpurmc.purpur.event.player.PlayerPreviewChatEvent purpurPreviewEvent = new org.purpurmc.purpur.event.player.PlayerPreviewChatEvent(entityplayer.getBukkitEntity(), "", adventureComponent);
++            org.purpurmc.purpur.event.player.PlayerPreviewChatEvent purpurPreviewEvent = new org.purpurmc.purpur.event.player.PlayerPreviewChatEvent(entityplayer.getBukkitEntity(), adventureComponent);
 +            if (!purpurPreviewEvent.callEvent()) {
 +                return CompletableFuture.completedFuture(null);
 +            }