From da78f95adc54ba0ff6fe8b785354e2f5c4e7d0a9 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Wed, 2 Oct 2024 14:05:28 -0400
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@69ffbec Fix hex color check
PaperMC/Paper@709f0f2 Use components properly in ProfileWhitelistVerifyEvent (#11456)
PaperMC/Paper@fb76840 [ci skip] Add section on nullability annotations (#11461)
---
 gradle.properties                                      | 2 +-
 patches/server/0052-Do-not-log-Not-Secure-marker.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f08dd41..965f998 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21.1-R0.1-SNAPSHOT
 
 mcVersion=1.21.1
-paperRef=e7e1ab56ca2a401aabacaee2de5818a93886bea3
+paperRef=fb768404aa8bdd35b95c88132b95f5cb529cc098
 
 org.gradle.caching=false
 org.gradle.parallel=true
diff --git a/patches/server/0052-Do-not-log-Not-Secure-marker.patch b/patches/server/0052-Do-not-log-Not-Secure-marker.patch
index a7f1c8d..b7283f7 100644
--- a/patches/server/0052-Do-not-log-Not-Secure-marker.patch
+++ b/patches/server/0052-Do-not-log-Not-Secure-marker.patch
@@ -29,7 +29,7 @@ index 14e412ebf75b0e06ab53a1c8f9dd1be6ad1e2680..f962e82e2c70f328a23dc99193d072f8
      }
  
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index c7c03291e9b49fbaaae8774ab3dcdc442c588e3a..32999fcbee6252c208e67bcc17cfb8ebbaad4e5b 100644
+index cce00b627b905793f8c663dc62e74fac895e618d..1c4051cb47fc2e070cef363bd670dff35baff35b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -102,6 +102,7 @@ import net.minecraft.world.phys.Vec3;
@@ -40,7 +40,7 @@ index c7c03291e9b49fbaaae8774ab3dcdc442c588e3a..32999fcbee6252c208e67bcc17cfb8eb
  import org.slf4j.Logger;
  
  // CraftBukkit start
-@@ -1396,7 +1397,7 @@ public abstract class PlayerList {
+@@ -1397,7 +1398,7 @@ public abstract class PlayerList {
          // Paper end
          boolean flag = this.verifyChatTrusted(message);