From 30d749a8f0d143e75b47c019927c31a93b6bb452 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Mon, 19 Feb 2024 01:45:21 +0300
Subject: [PATCH] Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@bcd90f7 Updated Upstream (Paper)
---
 README.md                                                     | 2 +-
 gradle.properties                                             | 2 +-
 patches/server/0001-Divine-Branding.patch                     | 4 ++--
 ...Do-not-process-chat-commands-before-player-has-joine.patch | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 1800745..de7820c 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
   
   [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/DivineMC/DivineMC/build.yml?logo=GoogleAnalytics&logoColor=ffffff&style=for-the-badge)](https://github.com/DivineMC/DivineMC/actions)
   [![Discord](https://img.shields.io/discord/931595732752953375?color=5865F2&label=discord&style=for-the-badge)](https://discord.gg/p7cxhw7E2M)
-  [![Download](https://img.shields.io/github/downloads/DivineMC/DivineMC/total?&style=for-the-badge&logoColor=ffffff)](https://github.com/DivineMC/DivineMC/releases/latest)
+  [![Download](https://img.shields.io/github/downloads/DivineMC/DivineMC/total?style=for-the-badge)](https://github.com/DivineMC/DivineMC/releases/latest)
 </div>
 
 ## ⚙️ Features
diff --git a/gradle.properties b/gradle.properties
index d2e079c..8a2fbc1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = space.bxteam.divinemc
 
 version = 1.20.4-R0.1-SNAPSHOT
-purpurRef = d66bc35cd896daddba767a84edfbc47dc6255089
+purpurRef = bcd90f7089dd090a20ea4138cdae0ab11b045281
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0001-Divine-Branding.patch b/patches/server/0001-Divine-Branding.patch
index a53f1f2..fb423ce 100644
--- a/patches/server/0001-Divine-Branding.patch
+++ b/patches/server/0001-Divine-Branding.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Divine Branding
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 0c92d10f334f82d196e065c0811d0c1f48887377..6964b6235bed4455b85aa69cef0049a769c5daad 100644
+index 6bceca84bd073e25fc9aa19b8b713a2873713696..76faa8e9965d0743fc51eb2d6e6838dd9e85dfba 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -14,7 +14,7 @@ val alsoShade: Configuration by configurations.creating
@@ -17,7 +17,7 @@ index 0c92d10f334f82d196e065c0811d0c1f48887377..6964b6235bed4455b85aa69cef0049a7
      implementation("io.papermc.paper:paper-mojangapi:${project.version}") {
          exclude("io.papermc.paper", "paper-api")
      }
-@@ -92,7 +92,7 @@ tasks.jar {
+@@ -93,7 +93,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
diff --git a/patches/server/0023-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0023-Do-not-process-chat-commands-before-player-has-joine.patch
index 82d160d..76bb2a6 100644
--- a/patches/server/0023-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/patches/server/0023-Do-not-process-chat-commands-before-player-has-joine.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not process chat/commands before player has joined
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 5b37a0bc513a68e0696362fa53633c125eb1fa8b..a96c4f89bb45af13bc4126dc90d0f943b5240942 100644
+index b7803d6753d28f174b8a6e5b31eccfa44b94c6be..45ff1a20630e4d72036cb0c900c06a785b1c3f24 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -6,6 +6,7 @@ import com.mojang.authlib.GameProfile;
@@ -16,7 +16,7 @@ index 5b37a0bc513a68e0696362fa53633c125eb1fa8b..a96c4f89bb45af13bc4126dc90d0f943
  import it.unimi.dsi.fastutil.ints.Int2ObjectMap.Entry;
  import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
  import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-@@ -2342,6 +2343,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2338,6 +2339,8 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
              this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
              return Optional.empty();