From 2727f5ae5971e0c7a28bad2e30a766d50c6cb89e Mon Sep 17 00:00:00 2001 From: NONPLAYT <76615486+NONPLAYT@users.noreply.github.com> Date: Tue, 10 Sep 2024 00:28:24 +0300 Subject: [PATCH] Updated Upstream (Purpur) Upstream has released updates that appear to apply and compile correctly Purpur Changes: PurpurMC/Purpur@0a9941e Updated Upstream (Paper) PurpurMC/Purpur@88352c3 Updated Upstream (Paper) PurpurMC/Purpur@dee41bc Updated Upstream (Paper) --- gradle.properties | 2 +- patches/server/0001-Divine-Branding.patch | 6 +++--- .../0003-Optimize-default-values-for-configs.patch | 10 +++++----- patches/server/0028-Delete-Timings.patch | 12 ++++++------ patches/server/0049-No-chat-sign.patch | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gradle.properties b/gradle.properties index a3f7173..6dbb414 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ group = space.bxteam.divinemc mcVersion = 1.21.1 version = 1.21.1-R0.1-SNAPSHOT -purpurRef = a43711d9b044d53911c6759d9d919cb2dc732e6f +purpurRef = dee41bc8c48e9ed535cfa3bf853846450506f001 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 75d452d..1ccf9e0 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 97a4a54dfa74df7aafd9df5a0f2fdac72471c2d5..2d98802c9f9bcc07458f6c44d4ba73d44fe943de 100644 +index 299881d2c9fb7321f4b29c019e9088e024b64689..b2c08943267f0254daad5f58e1a9472faa5d12a1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) { @@ -160,10 +160,10 @@ index 6d36fc6d8e22d9b68dea3830f6ecc8763184c343..4d2a8974546016b80182ca30e34a1d85 private static int fetchDistanceFromGitHub(final String repo, final String branch, final String hash) { try { diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -index 3cb56595822799926a8141e60a42f5d1edfc6de5..05478a1ea04ec0396bc8c97090edef4a2aced2a9 100644 +index 90b3526479320064378f2cde6c2f2b8e48a59ba6..43ff8842f697106d8d1ea4e58097243bf10f4d17 100644 --- a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java -@@ -17,7 +17,7 @@ public final class PaperConsole extends SimpleTerminalConsole { +@@ -20,7 +20,7 @@ public final class PaperConsole extends SimpleTerminalConsole { @Override protected LineReader buildReader(LineReaderBuilder builder) { builder diff --git a/patches/server/0003-Optimize-default-values-for-configs.patch b/patches/server/0003-Optimize-default-values-for-configs.patch index a206e30..32ee956 100644 --- a/patches/server/0003-Optimize-default-values-for-configs.patch +++ b/patches/server/0003-Optimize-default-values-for-configs.patch @@ -21,10 +21,10 @@ index 690086adcb1f87adc0b3ab664fde735ad3e1093a..e5eecd15040d4c0a7c8a0de166e5dddb public boolean strictAdvancementDimensionCheck = false; public IntOr.Default compressionLevel = IntOr.Default.USE_DEFAULT; diff --git a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -index f1b74f7b12fc7b35815886501937725b65f8a8e3..5227e17dc150feba6ae42eb60c721bb6f36d6565 100644 +index 790e3167cfa2511ef2fc707d9b9aa681a78d8ba0..98f9607dc0020df4e3739147252678617cb987f2 100644 --- a/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java +++ b/src/main/java/io/papermc/paper/configuration/WorldConfiguration.java -@@ -154,9 +154,9 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -153,9 +153,9 @@ public class WorldConfiguration extends ConfigurationPart { public ArmorStands armorStands; @@ -37,7 +37,7 @@ index f1b74f7b12fc7b35815886501937725b65f8a8e3..5227e17dc150feba6ae42eb60c721bb6 } public Markers markers; -@@ -273,8 +273,8 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -272,8 +272,8 @@ public class WorldConfiguration extends ConfigurationPart { public Behavior behavior; public class Behavior extends ConfigurationPart { @@ -48,7 +48,7 @@ index f1b74f7b12fc7b35815886501937725b65f8a8e3..5227e17dc150feba6ae42eb60c721bb6 public int experienceMergeMaxValue = -1; public boolean shouldRemoveDragon = false; public boolean zombiesTargetTurtleEggs = true; -@@ -298,7 +298,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -297,7 +297,7 @@ public class WorldConfiguration extends ConfigurationPart { public int playerInsomniaStartTicks = 72000; public int phantomsSpawnAttemptMinSeconds = 60; public int phantomsSpawnAttemptMaxSeconds = 119; @@ -57,7 +57,7 @@ index f1b74f7b12fc7b35815886501937725b65f8a8e3..5227e17dc150feba6ae42eb60c721bb6 @BelowZeroToEmpty public DoubleOr.Default zombieVillagerInfectionChance = DoubleOr.Default.USE_DEFAULT; public MobsCanAlwaysPickUpLoot mobsCanAlwaysPickUpLoot; -@@ -309,7 +309,7 @@ public class WorldConfiguration extends ConfigurationPart { +@@ -308,7 +308,7 @@ public class WorldConfiguration extends ConfigurationPart { } public boolean disablePlayerCrits = false; diff --git a/patches/server/0028-Delete-Timings.patch b/patches/server/0028-Delete-Timings.patch index b73ca1d..e96628b 100644 --- a/patches/server/0028-Delete-Timings.patch +++ b/patches/server/0028-Delete-Timings.patch @@ -929,7 +929,7 @@ index c3b39063f4cca69ecf71708e2ad5d92bbafa5ea8..cf3a4f60f8cbf40cc7448fd80979f55c // Paper start if (waitableArray[0] != null) { diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java -index 37b50001ea83481610f789dd718eab8fb79ea250..acf6ef9168033784a640294d97dc738a0756afcc 100644 +index 857c8bd79b2d9a634db25408d7305968e29f9846..82c7563de4c947c7ee3331112720ad7160f362b8 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java @@ -1,6 +1,5 @@ @@ -940,7 +940,7 @@ index 37b50001ea83481610f789dd718eab8fb79ea250..acf6ef9168033784a640294d97dc738a import com.google.common.collect.ImmutableList.Builder; import com.google.common.collect.Iterables; diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java -index 29e31ed2d09aee3b668816a683ab0f89026fdf4f..657801f794bdf25c2401a1b81a5243063e2b7852 100644 +index c601061d1abb8f4a66dd5e478cf69a872a4d0f6f..ab0f96229a79e3832b19e9becbfaaceeab34254b 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -1,7 +1,6 @@ @@ -970,7 +970,7 @@ index 29e31ed2d09aee3b668816a683ab0f89026fdf4f..657801f794bdf25c2401a1b81a524306 entity.postTick(); // CraftBukkit } else { entity.inactiveTick(); } // Paper - EAR 2 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index 1babe6756b904fd2e5b2d62f6adfa153e3b772f1..c4698cadb76164131a612c0906704b847ca7a0e8 100644 +index e4978abcc79ee51fa95442b82d9079c8ee1e60d6..73c6b53ef3db85aa3b2ac31013340878e2dd158d 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -1,6 +1,5 @@ @@ -1009,7 +1009,7 @@ index d3de0362dd1ef3954d05c4d8fa56a25edfe1bb2b..6ac3dfab99cfb0b51c81cc20e71da126 return this != EntityType.PLAYER && this != EntityType.LLAMA_SPIT && this != EntityType.WITHER && this != EntityType.BAT && this != EntityType.ITEM_FRAME && this != EntityType.GLOW_ITEM_FRAME && this != EntityType.LEASH_KNOT && this != EntityType.PAINTING && this != EntityType.END_CRYSTAL && this != EntityType.EVOKER_FANGS; } diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 5fa5e8d5d71adb5c364e1aede36855dbcfdaa367..74518b87c82aa4f2a5a7a668d8d4579459dcdeed 100644 +index 9385a5a61fdd2e623e7a3ced7bec8cae8013e419..cb2885da87d0b2073d8dbd35353f16983120b57e 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -157,7 +157,6 @@ import org.bukkit.event.entity.EntityTeleportEvent; @@ -1214,7 +1214,7 @@ index d3ec817e95628f1fc8be4a29c9a0f13c7d5fd552..e9798517b9211c50a20ea5c69603aab3 } } diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java -index d6aae48a5920ccad0ee6c7ff2bacaa1ac7d8353b..0dd6d59739a2cd72e5720d289aad3ecb8a6e6b18 100644 +index af7e7ad028b169bfc80adf32b0194b3988551b52..a37dae20efb5af46fde27af3a53e3cc6e6c7e042 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java @@ -200,7 +200,7 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -1226,7 +1226,7 @@ index d6aae48a5920ccad0ee6c7ff2bacaa1ac7d8353b..0dd6d59739a2cd72e5720d289aad3ecb } // Paper end -@@ -482,7 +482,7 @@ public final class CraftMagicNumbers implements UnsafeValues { +@@ -478,7 +478,7 @@ public final class CraftMagicNumbers implements UnsafeValues { // Paper start @Override public String getTimingsServerName() { diff --git a/patches/server/0049-No-chat-sign.patch b/patches/server/0049-No-chat-sign.patch index f5427f7..84d7fd6 100644 --- a/patches/server/0049-No-chat-sign.patch +++ b/patches/server/0049-No-chat-sign.patch @@ -147,10 +147,10 @@ index fac2fb82c381d245f77b7288c34920660ac2c3af..b3ca62843b17c536840cb4edb700f9c2 if (packet == null || this.processedDisconnect) { // Spigot return; diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java -index c4698cadb76164131a612c0906704b847ca7a0e8..cad080581c9fdc19f49fd10c6367feede4bcdf47 100644 +index 73c6b53ef3db85aa3b2ac31013340878e2dd158d..74a158424ab26088ff9765028fca9e1083203980 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java -@@ -1454,7 +1454,7 @@ public abstract class PlayerList { +@@ -1455,7 +1455,7 @@ public abstract class PlayerList { } public boolean verifyChatTrusted(PlayerChatMessage message) { // Paper - private -> public