From 1cabe0fef50221384732afb0ac2a86d96016e07c Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Wed, 18 Jun 2025 08:20:06 +0800
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@023e6c29 Ensure waypoints are per world
PaperMC/Paper@40d5d31c Fix recursively converting JSON Text Components
---
 gradle.properties                                             | 2 +-
 ...0276-do-not-log-invalid-flatten-text-component-parse.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 40e36326..5e3e3eb7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=cn.dreeam.leaf
 mcVersion=1.21.6
 version=1.21.6-R0.1-SNAPSHOT
 
-paperCommit=d2b1158e6c3563960f22579a0189a257711971e3
+paperCommit=40d5d31c83169419f25e618f5a0f731e67952ced
 
 org.gradle.configuration-cache=true
 org.gradle.caching=true
diff --git a/leaf-server/minecraft-patches/features/0276-do-not-log-invalid-flatten-text-component-parse.patch b/leaf-server/minecraft-patches/features/0276-do-not-log-invalid-flatten-text-component-parse.patch
index 8d9554b7..3a4c7244 100644
--- a/leaf-server/minecraft-patches/features/0276-do-not-log-invalid-flatten-text-component-parse.patch
+++ b/leaf-server/minecraft-patches/features/0276-do-not-log-invalid-flatten-text-component-parse.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] do not log invalid flatten text component parse
 
 
 diff --git a/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java b/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java
-index 4197a5e89aec77f2893f0f118a927b96d5377ec1..de99a05bbe3e8dac2d6307eb53d954d77904a0c4 100644
+index ca9e3667b420f54f42b358068c102fe0cae4102d..88901f4783a85cc764bb2db20aed69f96b2bc8c3 100644
 --- a/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java
 +++ b/ca/spottedleaf/dataconverter/minecraft/versions/V4290.java
-@@ -191,7 +191,7 @@ public final class V4290 {
+@@ -189,7 +189,7 @@ public final class V4290 {
                          return ret;
                      }
                  } catch (final JsonParseException ex) {