From 792e8c243fa5952379690528a0350152eee7de34 Mon Sep 17 00:00:00 2001
From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
Date: Mon, 24 Jul 2023 13:59:40 +0300
Subject: [PATCH] Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@7cefa0c Updated Upstream (Paper)
---
 gradle.properties                               |  2 +-
 ...04-Optimize-default-values-for-configs.patch | 17 +++++++++++++++--
 patches/server/0029-Fix-MC-7569.patch           |  1 +
 patches/server/0030-Fix-MC-93018.patch          |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f3c1149..a568097 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,7 +1,7 @@
 group = gq.bxteam.divinemc
 
 version = 1.20.1-R0.1-SNAPSHOT
-purpurRef = 8fec60c7bc577a5b97aaf52154561ff365bb1850
+purpurRef = 7cefa0cafab8223cff8a3ff754129b3e5c41bad3
 
 org.gradle.caching = true
 org.gradle.parallel = true
diff --git a/patches/server/0004-Optimize-default-values-for-configs.patch b/patches/server/0004-Optimize-default-values-for-configs.patch
index 614076e..15ca968 100644
--- a/patches/server/0004-Optimize-default-values-for-configs.patch
+++ b/patches/server/0004-Optimize-default-values-for-configs.patch
@@ -4,8 +4,21 @@ Date: Mon, 27 Mar 2023 13:16:41 +0300
 Subject: [PATCH] Optimize default values for configs
 
 
+diff --git a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+index 3e36958365bc136516bafbaad0c168f7956406f1..b3594f563489e210544cc573cbe1c13d1effe52b 100644
+--- a/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
++++ b/src/main/java/gg/pufferfish/pufferfish/PufferfishConfig.java
+@@ -211,7 +211,7 @@ public class PufferfishConfig {
+     public static int maxProjectileLoadsPerTick;
+     public static int maxProjectileLoadsPerProjectile;
+     private static void projectileLoading() {
+-        maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 10, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick.");
++        maxProjectileLoadsPerTick = getInt("projectile.max-loads-per-tick", 8, "Controls how many chunks are allowed", "to be sync loaded by projectiles in a tick."); // DivineMC - optimize default values for configs
+         maxProjectileLoadsPerProjectile = getInt("projectile.max-loads-per-projectile", 10, "Controls how many chunks a projectile", "can load in its lifetime before it gets", "automatically removed.");
+ 
+         setComment("projectile", "Optimizes projectile settings");
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index ffbab76e55807f04ebb25242eadbea114004b1b3..6244886926b41cf62ec02bb63af6e13d886a0c70 100644
+index d7f541d94941a341a70dfac025a3d3601dd1aca8..b7347f89702d449bdcf84e96c75d917d7834046b 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -52,7 +52,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -17,7 +30,7 @@ index ffbab76e55807f04ebb25242eadbea114004b1b3..6244886926b41cf62ec02bb63af6e13d
          public boolean serverNamePrivacy = false;
          public List<String> hiddenConfigEntries = List.of(
              "database",
-@@ -264,9 +264,9 @@ public class GlobalConfiguration extends ConfigurationPart {
+@@ -272,9 +272,9 @@ public class GlobalConfiguration extends ConfigurationPart {
          public boolean fixEntityPositionDesync = true;
          public boolean loadPermissionsYmlBeforePlugins = true;
          @Constraints.Min(4)
diff --git a/patches/server/0029-Fix-MC-7569.patch b/patches/server/0029-Fix-MC-7569.patch
index 043a38f..12a0f44 100644
--- a/patches/server/0029-Fix-MC-7569.patch
+++ b/patches/server/0029-Fix-MC-7569.patch
@@ -3,6 +3,7 @@ From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
 Date: Sun, 16 Jul 2023 12:21:09 +0300
 Subject: [PATCH] Fix MC-7569
 
+Original post on Mojira: https://bugs.mojang.com/browse/MC-7569
 
 diff --git a/src/main/java/net/minecraft/server/rcon/RconConsoleSource.java b/src/main/java/net/minecraft/server/rcon/RconConsoleSource.java
 index 986beb0f2400b9f1d2fc3637574ddd01b1f07b8e..b97cf411c80f76a27ea83bd80d5f457cff67507c 100644
diff --git a/patches/server/0030-Fix-MC-93018.patch b/patches/server/0030-Fix-MC-93018.patch
index dd22141..c5be8d5 100644
--- a/patches/server/0030-Fix-MC-93018.patch
+++ b/patches/server/0030-Fix-MC-93018.patch
@@ -3,6 +3,7 @@ From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com>
 Date: Sun, 16 Jul 2023 13:51:26 +0300
 Subject: [PATCH] Fix MC-93018
 
+Original post on Mojira: https://bugs.mojang.com/browse/MC-93018
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/Wolf.java b/src/main/java/net/minecraft/world/entity/animal/Wolf.java
 index 64bceae4d06b35fcbecb0daca2496ba30e39d995..139550c9aeceaa31c09429e5bff13ddc50ef6827 100644