From ec9c83fa2b17cc4fdb696bed97b51b5feaded8a6 Mon Sep 17 00:00:00 2001
From: Kezz <kieran.wallbanks@gmail.com>
Date: Wed, 30 Jul 2025 18:43:51 +0100
Subject: [PATCH] Adventure 4.24.0 (#12908)

---
 paper-api/build.gradle.kts                                 | 2 +-
 paper-server/build.gradle.kts                              | 2 +-
 .../connection/PaperPlayerConfigurationConnection.java     | 6 ++++++
 .../java/org/bukkit/craftbukkit/entity/CraftPlayer.java    | 7 +++++++
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/paper-api/build.gradle.kts b/paper-api/build.gradle.kts
index 707bdbf0cb..c5f6ecd78f 100644
--- a/paper-api/build.gradle.kts
+++ b/paper-api/build.gradle.kts
@@ -11,7 +11,7 @@ java {
 
 val annotationsVersion = "26.0.2"
 // Keep in sync with paper-server adventure-text-serializer-ansi dep
-val adventureVersion = "4.23.0"
+val adventureVersion = "4.24.0"
 val bungeeCordChatVersion = "1.21-R0.2-deprecated+build.21"
 val slf4jVersion = "2.0.16"
 val log4jVersion = "2.24.1"
diff --git a/paper-server/build.gradle.kts b/paper-server/build.gradle.kts
index c7de525bb4..2270570219 100644
--- a/paper-server/build.gradle.kts
+++ b/paper-server/build.gradle.kts
@@ -134,7 +134,7 @@ dependencies {
     implementation("org.jline:jline-terminal-ffm:3.27.1") // use ffm on java 22+
     implementation("org.jline:jline-terminal-jni:3.27.1") // fall back to jni on java 21
     implementation("net.minecrell:terminalconsoleappender:1.3.0")
-    implementation("net.kyori:adventure-text-serializer-ansi:4.23.0") // Keep in sync with adventureVersion from Paper-API build file
+    implementation("net.kyori:adventure-text-serializer-ansi:4.24.0") // Keep in sync with adventureVersion from Paper-API build file
     runtimeConfiguration(sourceSets.main.map { it.runtimeClasspath })
 
     /*
diff --git a/paper-server/src/main/java/io/papermc/paper/connection/PaperPlayerConfigurationConnection.java b/paper-server/src/main/java/io/papermc/paper/connection/PaperPlayerConfigurationConnection.java
index 7adb48a2b9..e47d9bdc02 100644
--- a/paper-server/src/main/java/io/papermc/paper/connection/PaperPlayerConfigurationConnection.java
+++ b/paper-server/src/main/java/io/papermc/paper/connection/PaperPlayerConfigurationConnection.java
@@ -19,6 +19,7 @@ import net.kyori.adventure.resource.ResourcePackCallback;
 import net.kyori.adventure.resource.ResourcePackInfo;
 import net.kyori.adventure.resource.ResourcePackRequest;
 import net.minecraft.network.chat.Component;
+import net.minecraft.network.protocol.common.ClientboundClearDialogPacket;
 import net.minecraft.network.protocol.common.ClientboundResourcePackPopPacket;
 import net.minecraft.network.protocol.common.ClientboundResourcePackPushPacket;
 import net.minecraft.network.protocol.common.ClientboundShowDialogPacket;
@@ -73,6 +74,11 @@ public class PaperPlayerConfigurationConnection extends PaperCommonConnection<Se
         this.handle.send(new ClientboundShowDialogPacket(PaperDialog.bukkitToMinecraftHolder((Dialog) dialog)));
     }
 
+    @Override
+    public void closeDialog() {
+        this.handle.send(ClientboundClearDialogPacket.INSTANCE);
+    }
+
     @Override
     public Pointers pointers() {
         if (this.adventurePointers == null) {
diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index c0ef55c206..322a1e3879 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -57,6 +57,7 @@ import net.minecraft.core.Holder;
 import net.minecraft.core.SectionPos;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.PlayerChatMessage;
+import net.minecraft.network.protocol.common.ClientboundClearDialogPacket;
 import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
 import net.minecraft.network.protocol.common.ClientboundResourcePackPopPacket;
 import net.minecraft.network.protocol.common.ClientboundResourcePackPushPacket;
@@ -2497,6 +2498,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
         this.getHandle().openDialog(PaperDialog.bukkitToMinecraftHolder((Dialog) dialog));
     }
 
+    @Override
+    public void closeDialog() {
+        if (this.getHandle().connection == null) return;
+        this.getHandle().connection.send(ClientboundClearDialogPacket.INSTANCE);
+    }
+
     // Paper start - more resource pack API
     @Override
     public org.bukkit.event.player.PlayerResourcePackStatusEvent.Status getResourcePackStatus() {