From c781eed75e9a49ea2a7dde610e48bfc38e2ea899 Mon Sep 17 00:00:00 2001
From: granny <granny@purpurmc.org>
Date: Wed, 14 Jun 2023 22:05:16 -0700
Subject: [PATCH] Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@62262d7 [ci skip] mention adventure in chatcolor deprecation message (#9336)
PaperMC/Paper@837cc25 Call BlockEntity#load in new child types (#9340)
PaperMC/Paper@bae6096 Re-add dropped patch during 1.20 update (#9344)
---
 gradle.properties                             | 2 +-
 patches/api/0018-ChatColor-conveniences.patch | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 86ab27745..ca179add8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
 version = 1.20.1-R0.1-SNAPSHOT
 
 mcVersion = 1.20.1
-paperCommit = 2e363c73ba3c0a7b3d5138ec55a6e93c7befb5bb
+paperCommit = bae6096aa28a1810ec24215cdbae52c255ad736a
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/api/0018-ChatColor-conveniences.patch b/patches/api/0018-ChatColor-conveniences.patch
index 39b7dfb7d..1cbcc2653 100644
--- a/patches/api/0018-ChatColor-conveniences.patch
+++ b/patches/api/0018-ChatColor-conveniences.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] ChatColor conveniences
 
 
 diff --git a/src/main/java/org/bukkit/ChatColor.java b/src/main/java/org/bukkit/ChatColor.java
-index ea4ceb643239c26851bacbf45fc3f2efef3bb4be..3b8395dcb73e3fb251adf7438cbc7e95c4185a3a 100644
+index 918a045165cdcde264bc24082b7afebb407271de..687d11619379aead7f665d4a5f8f8bcc857cb8e9 100644
 --- a/src/main/java/org/bukkit/ChatColor.java
 +++ b/src/main/java/org/bukkit/ChatColor.java
 @@ -3,6 +3,7 @@ package org.bukkit;
@@ -16,7 +16,7 @@ index ea4ceb643239c26851bacbf45fc3f2efef3bb4be..3b8395dcb73e3fb251adf7438cbc7e95
  import java.util.regex.Pattern;
  import org.jetbrains.annotations.Contract;
  import org.jetbrains.annotations.NotNull;
-@@ -455,4 +456,77 @@ public enum ChatColor {
+@@ -456,4 +457,77 @@ public enum ChatColor {
              BY_CHAR.put(color.code, color);
          }
      }